From 831ee89117fab360646e2f439be0a54526c2dd61 Mon Sep 17 00:00:00 2001 From: limin Date: Thu, 2 Jan 2025 10:33:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=8A=B6=E6=80=81=E4=B8=8D=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/llm/dal/mysql/dataset/DatasetMapper.java | 4 ++-- .../llm/service/dataset/DatasetQuestionServiceImpl.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java index b49a4ffa3..46caa6e36 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java @@ -34,8 +34,8 @@ public interface DatasetMapper extends BaseMapperX { .orderByDesc(DatasetDO::getId)); } - @Update("update llm_dataset set annotate_progress = #{formattedRatio} where id = #{datasetId}") - void updateProcess(@Param("formattedRatio") Integer formattedRatio, @Param("datasetId") Long datasetId); + @Update("update llm_dataset set annotate_progress = #{formattedRatio},status=#{status} where id = #{datasetId}") + void updateProcess(@Param("formattedRatio") Integer formattedRatio, @Param("datasetId") Long datasetId,@Param("status") Integer status); @Delete("delete from llm_dataset where id = #{datasetPostId}") void deleteTrue(@Param("datasetPostId") Long datasetPostId); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java index 5e8bb246f..c705a207a 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataset/DatasetQuestionServiceImpl.java @@ -110,6 +110,9 @@ public class DatasetQuestionServiceImpl implements DatasetQuestionService { public void updateDatasetQuestionDataAnno(List updateReqVOS) { updateReqVOS.forEach(updateReqVO -> { DatasetQuestionDO datasetQuestionDO = BeanUtils.toBean(updateReqVO, DatasetQuestionDO.class); + if (CollectionUtils.isNotEmpty(updateReqVO.getDatasetAnswerRespVO())){ + datasetQuestionDO.setStatus(2); + } datasetQuestionMapper.updateById(datasetQuestionDO); List datasetAnswerSaveReqVO = updateReqVO.getDatasetAnswerRespVO(); List datasetAnswerDOS = BeanUtils.toBean(datasetAnswerSaveReqVO, DatasetAnswerDO.class); @@ -125,7 +128,8 @@ public class DatasetQuestionServiceImpl implements DatasetQuestionService { Long annoCount = datasetQuestionMapper.selectCount(wrapper); double ratio = sumCount == 0 ? 0 : ((double) annoCount / sumCount) *100; Integer formattedRatio = ratio == 0 ? 0 : (int) ratio; - datasetMapper.updateProcess(formattedRatio, updateReqVOS.get(0).getDatasetId()); + Integer status = formattedRatio == 100 ? 2 : 1; + datasetMapper.updateProcess(formattedRatio, updateReqVOS.get(0).getDatasetId(),status); } } \ No newline at end of file