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() .eq(DatasetQuestionDO::getDatasetId, dataset.getId())); dataset.setDataLength(count); + Long annoCount = datasetQuestionMapper.selectCount(new LambdaQueryWrapper() + .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 jsonList = mapper.readValue(content.toString(), new TypeReference>() {}); jsonList.forEach( dataJsonTemplate -> { + List 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 answers = dataJsonTemplate.getAnswers(); if (CollectionUtils.isNotEmpty(answers)){ for (String answer : answers) { DatasetAnswerDO datasetAnswerDO = new DatasetAnswerDO();