diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java index de852c9..8026ec9 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java @@ -1,5 +1,6 @@ package org.jeecg.modules.database.mapper; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,6 +14,7 @@ import java.util.List; * @Date: 2024-11-04 * @Version: V1.0 */ +@DS("client") public interface NasaDataRecordMapper extends BaseMapper { @Select("SELECT SUM(total_count_lhs) FROM nasa_data_record where total_count_lhs is not null") diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java index 63a91ab..870e9ca 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java @@ -155,20 +155,22 @@ public class ExperimentReviewServiceImpl extends ServiceImpl= 1 && last.getResult().equals(ExperimentReviewResultEnum.NOT_PASS)) { - return ExperimentReviewResultEnum.NOT_PASS; - } - if (detailList.size() > 1 && !StrUtil.equals(first.getResult(), last.getResult())) { + if (CollUtil.isEmpty(detailList)) { return ExperimentReviewResultEnum.UNKNOWN; } - if (detailList.size() == 1 && last.getResult().equals(ExperimentReviewResultEnum.FINAL_PASS)) { - return ExperimentReviewResultEnum.FINAL_PASS; + if (detailList.size() == 1) { + return last.getResult(); } - if (detailList.size() == 2 && StrUtil.equals(first.getResult(), last.getResult())) { - return first.getResult(); - } - if (detailList.size() == 2 && !StrUtil.equals(first.getResult(), last.getResult())) { - return ExperimentReviewResultEnum.UNKNOWN; + if (detailList.size() > 1) { + if (last.getResult().equals(ExperimentReviewResultEnum.NOT_PASS)) { + return ExperimentReviewResultEnum.NOT_PASS; + } + if (!StrUtil.equals(first.getResult(), last.getResult())) { + return ExperimentReviewResultEnum.UNKNOWN; + } + if (StrUtil.equals(first.getResult(), last.getResult())) { + return first.getResult(); + } } if (detailList.size() > 2) { return ExperimentReviewResultEnum.UNKNOWN;