From 1229366d67d94da71ddd856aa52e6a871ddbaa84 Mon Sep 17 00:00:00 2001
From: limin <limin@qq.com>
Date: Tue, 31 Dec 2024 13:07:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=B0=83=E4=BC=98=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E6=9F=A5=E8=AF=A2=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finetuningtask/FineTuningTaskController.java |  3 +--
 .../finetuningtask/FineTuningTaskService.java    |  2 +-
 .../FineTuningTaskServiceImpl.java               | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java
index e13e6357b..5ca6bcfa2 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java
@@ -67,8 +67,7 @@ public class FineTuningTaskController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('llm:fine-tuning-task:query')")
     public CommonResult<FineTuningTaskRespVO> getFineTuningTask(@RequestParam("id") Long id) {
-        FineTuningTaskDO fineTuningTask = fineTuningTaskService.getFineTuningTask(id);
-        return success(BeanUtils.toBean(fineTuningTask, FineTuningTaskRespVO.class));
+        return success(fineTuningTaskService.getFineTuningTask(id));
     }
 
     @PutMapping("/stop")
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java
index d94bb516f..87c3d2ee1 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java
@@ -42,7 +42,7 @@ public interface FineTuningTaskService {
      * @param id 编号
      * @return 模型调优 —— 微调任务
      */
-    FineTuningTaskDO getFineTuningTask(Long id);
+    FineTuningTaskRespVO getFineTuningTask(Long id);
 
     /**
      * 获得模型调优 —— 微调任务分页
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java
index f19020f76..e4ffc1047 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java
@@ -81,8 +81,20 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService {
     }
 
     @Override
-    public FineTuningTaskDO getFineTuningTask(Long id) {
-        return fineTuningTaskMapper.selectById(id);
+    public FineTuningTaskRespVO getFineTuningTask(Long id) {
+        FineTuningTaskDO fineTuningTaskDO = fineTuningTaskMapper.selectById(id);
+        FineTuningTaskRespVO result = BeanUtils.toBean(fineTuningTaskDO, FineTuningTaskRespVO.class);
+        Long dataset = fineTuningTaskDO.getDataset();
+        if (dataset != null) {
+            DatasetDO datasetDO = datasetMapper.selectById(dataset);
+            result.setDatasetName(datasetDO.getDatasetName());
+        }
+        Long baseModelId = fineTuningTaskDO.getBaseModelId();
+        if (baseModelId != null) {
+            BaseModelDO baseModelDO = baseModelMapper.selectById(baseModelId);
+            result.setBaseModelName(baseModelDO.getModelName());
+        }
+        return result;
     }
     @Override
     public PageResult<FineTuningTaskRespVO> getFineTuningTaskPage1(FineTuningTaskPageReqVO pageReqVO) {