From 686366422cfe1dc072b8d9e5eefd72b15a9d87de Mon Sep 17 00:00:00 2001
From: limin <limin@qq.com>
Date: Mon, 6 Jan 2025 09:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=20=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../llm/service/dataset/DatasetServiceImpl.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java
index 3e97799a2..84318ff88 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetServiceImpl.java
@@ -77,6 +77,16 @@ public class DatasetServiceImpl implements DatasetService {
             Long count = datasetQuestionMapper.selectCount(new LambdaQueryWrapper<DatasetQuestionDO>()
                     .eq(DatasetQuestionDO::getDatasetId, dataset.getId()));
             dataset.setDataLength(count);
+            Long annoCount = datasetQuestionMapper.selectCount(new LambdaQueryWrapper<DatasetQuestionDO>()
+                    .eq(DatasetQuestionDO::getDatasetId, dataset.getId())
+                    .eq(DatasetQuestionDO::getStatus,2));
+            double ratio = count == 0 ? 0 : ((double) annoCount / count) *100;
+            Integer formattedRatio = ratio == 0 ? 0 : (int) ratio;
+            Integer status = formattedRatio == 100 ? 2 : 1;
+            if (formattedRatio != null){
+                dataset.setAnnotateProgress(formattedRatio);
+            }
+            dataset.setStatus(status);
             datasetMapper.updateById(dataset);
         }
         return dataset.getId();
@@ -117,9 +127,11 @@ public class DatasetServiceImpl implements DatasetService {
                     .eq(DatasetQuestionDO::getStatus,2));
             double ratio = count == 0 ? 0 : ((double) annoCount / count) *100;
             Integer formattedRatio = ratio == 0 ? 0 : (int) ratio;
+            Integer status = formattedRatio == 100 ? 2 : 1;
             if (formattedRatio != null){
                 updateObj.setAnnotateProgress(formattedRatio);
             }
+            updateObj.setStatus(status);
         }
         datasetMapper.updateById(updateObj);
     }
@@ -213,11 +225,12 @@ public class DatasetServiceImpl implements DatasetService {
                     List<DataJsonTemplate> jsonList = mapper.readValue(content.toString(), new TypeReference<List<DataJsonTemplate>>() {});
                     jsonList.forEach(
                             dataJsonTemplate -> {
+                                List<String> answers = dataJsonTemplate.getAnswers();
                                 DatasetQuestionDO datasetQuestionDO = BeanUtils.toBean(dataJsonTemplate, DatasetQuestionDO.class);
                                 datasetQuestionDO.setDatasetId(datasetFilesDO.getDatasetId());
                                 datasetQuestionDO.setDatasetFilesId(datasetFilesDO.getId());
+                                datasetQuestionDO.setStatus(CollectionUtils.isNotEmpty(answers) ? 2:0);
                                 datasetQuestionMapper.insert(datasetQuestionDO);
-                                List<String> answers = dataJsonTemplate.getAnswers();
                                 if (CollectionUtils.isNotEmpty(answers)){
                                     for (String answer : answers) {
                                         DatasetAnswerDO datasetAnswerDO = new DatasetAnswerDO();