[fix] 人工评估时数据集问题不存在报错

This commit is contained in:
Liuyang 2025-01-22 15:05:00 +08:00
parent 100bf5fa74
commit fc16df821c
2 changed files with 14 additions and 1 deletions

View File

@ -110,4 +110,6 @@ public interface ErrorCodeConstants {
ErrorCode LABEL_NAME_EXISTS = new ErrorCode(10045, "标签名称重复");
ErrorCode PARSE_CSV_ERROR = new ErrorCode(10034, "请正确上传csv格式得数据");
ErrorCode QUESTION_NOT_EXISTS = new ErrorCode(10046, "数据集信息不完整,无法进行评估");
}

View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.llm.service.modelassesstaskmanual;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.exception.ErrorCode;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.module.llm.controller.admin.dataset.vo.DatasetAnswerRespVO;
import cn.iocoder.yudao.module.llm.controller.admin.dataset.vo.DatasetQuestionPageReqVO;
@ -22,6 +23,7 @@ import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetQuestionMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.*;
import cn.iocoder.yudao.module.llm.service.dataset.DatasetQuestionService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springdoc.core.GenericResponseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -82,8 +84,17 @@ public class ManualModelAnswerServiceImpl implements ManualModelAnswerService {
modelAnswerDOPageResult.getList().forEach(modelAnswerDO -> {
ManualAssessmentPageRespVO resp = BeanUtils.toBean(modelAssessTaskManual, ManualAssessmentPageRespVO.class);
DatasetQuestionDO datasetQuestionDO = datasetQuestionMapper.selectById(modelAnswerDO.getQuestionId());
if (datasetQuestionDO==null){
throw exception(QUESTION_NOT_EXISTS);
}
List<DatasetAnswerDO> datasetAnswerDOS = datasetAnswerMapper.selectList(new LambdaQueryWrapper<>(DatasetAnswerDO.class).eq(DatasetAnswerDO::getQuestionId, modelAnswerDO.getQuestionId()));
resp.setQuestion(datasetQuestionDO.getQuestion());
String question = datasetQuestionDO.getQuestion();
if (StringUtils.isBlank(question)){
throw exception(QUESTION_NOT_EXISTS);
}
resp.setQuestion(question);
resp.setSystem(datasetQuestionDO.getSystem());
resp.setAnswers(BeanUtils.toBean(datasetAnswerDOS, DatasetAnswerRespVO.class));
resp.setModelAnswer(modelAnswerDO.getModelAnswer());