From 95a0c0a52b1713a018b3d8fa3cb5f44274663f8b Mon Sep 17 00:00:00 2001 From: dengchun Date: Thu, 1 May 2025 23:14:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=AF=95=E9=AA=8C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/database/entity/Experiment.java | 6 ++++++ .../database/service/impl/ExperimentServiceImpl.java | 8 ++++++++ 2 files changed, 14 insertions(+) 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<>()); }