diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index 43719fa..37acacc 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -234,4 +234,10 @@ public class Experiment implements Serializable { @Schema(description = "理化所统计") private Integer totalCountLhs; + /** + * 试验报告审核状态,给报告审核页面用,不用存库。 + */ + @Schema(description = "理化所统计") + private String reportStatus; + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java index 8b9fca2..0b7decc 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; +import org.jeecg.modules.database.constant.ExperimentReportStatus; import org.jeecg.modules.database.constant.ExperimentStatus; import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.mapper.ExperimentMapper; @@ -127,6 +128,13 @@ public class ExperimentServiceImpl extends ServiceImpl reportList = experimentReportService.getByExperimentId(experiment.getId()); if (CollUtil.isNotEmpty(reportList)) { experiment.setExperimentReportList(reportList); + //给试验报告审核页面显示报告状态 + List unFinishedReportList = reportList.stream().filter(v -> !v.getStatus().equals(ExperimentReportStatus.PASSED)).collect(Collectors.toList()); + if (CollUtil.isNotEmpty(unFinishedReportList)) { + experiment.setReportStatus(unFinishedReportList.get(0).getStatus()); + }else { + experiment.setReportStatus(ExperimentReportStatus.PASSED); + } } else { experiment.setExperimentReportList(new ArrayList<>()); }