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 9dcc8bd..796f698 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 @@ -151,15 +151,15 @@ 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())) { return ExperimentReviewResultEnum.UNKNOWN; } - if (detailList.size() == 1 && first.getResult().equals(ExperimentReviewResultEnum.FINAL_PASS)) { + if (detailList.size() == 1 && last.getResult().equals(ExperimentReviewResultEnum.FINAL_PASS)) { return ExperimentReviewResultEnum.FINAL_PASS; } - if (detailList.size() == 1 && first.getResult().equals(ExperimentReviewResultEnum.NOT_PASS)) { - return ExperimentReviewResultEnum.NOT_PASS; - } if (detailList.size() == 2 && StrUtil.equals(first.getResult(), last.getResult())) { return first.getResult(); }