physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2025-07-30 20:59:52 +08:00
parent 6701e1e1ca
commit bdfe0bd4a0
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java
View File

@@ -1,5 +1,6 @@
package org.jeecg.modules.database.mapper; package org.jeecg.modules.database.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@@ -13,6 +14,7 @@ import java.util.List;
* @Date: 2024-11-04 * @Date: 2024-11-04
* @Version: V1.0 * @Version: V1.0
*/ */
@DS("client")
public interface NasaDataRecordMapper extends BaseMapper<NasaDataRecord> { public interface NasaDataRecordMapper extends BaseMapper<NasaDataRecord> {
@Select("SELECT SUM(total_count_lhs) FROM nasa_data_record where total_count_lhs is not null") @Select("SELECT SUM(total_count_lhs) FROM nasa_data_record where total_count_lhs is not null")

24
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
View File

@@ -155,20 +155,22 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
result.setMatchedRuleList(matchedRuleList); result.setMatchedRuleList(matchedRuleList);
ExperimentReviewDetail first = CollUtil.getFirst(detailList); ExperimentReviewDetail first = CollUtil.getFirst(detailList);
ExperimentReviewDetail last = CollUtil.getLast(detailList); ExperimentReviewDetail last = CollUtil.getLast(detailList);
if (detailList.size() >= 1 && last.getResult().equals(ExperimentReviewResultEnum.NOT_PASS)) { if (CollUtil.isEmpty(detailList)) {
return ExperimentReviewResultEnum.NOT_PASS;
}
if (detailList.size() > 1 && !StrUtil.equals(first.getResult(), last.getResult())) {
return ExperimentReviewResultEnum.UNKNOWN; return ExperimentReviewResultEnum.UNKNOWN;
} }
if (detailList.size() == 1 && last.getResult().equals(ExperimentReviewResultEnum.FINAL_PASS)) { if (detailList.size() == 1) {
return ExperimentReviewResultEnum.FINAL_PASS; return last.getResult();
} }
if (detailList.size() == 2 && StrUtil.equals(first.getResult(), last.getResult())) { if (detailList.size() > 1) {
return first.getResult(); if (last.getResult().equals(ExperimentReviewResultEnum.NOT_PASS)) {
} return ExperimentReviewResultEnum.NOT_PASS;
if (detailList.size() == 2 && !StrUtil.equals(first.getResult(), last.getResult())) { }
return ExperimentReviewResultEnum.UNKNOWN; if (!StrUtil.equals(first.getResult(), last.getResult())) {
return ExperimentReviewResultEnum.UNKNOWN;
}
if (StrUtil.equals(first.getResult(), last.getResult())) {
return first.getResult();
}
} }
if (detailList.size() > 2) { if (detailList.size() > 2) {
return ExperimentReviewResultEnum.UNKNOWN; return ExperimentReviewResultEnum.UNKNOWN;