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

给试验报告审核页面显示报告状态

Browse Source
This commit is contained in:
dengchun
2025-05-01 23:14:36 +08:00
parent 8f6df01060
commit 95a0c0a52b
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
View File

@@ -234,4 +234,10 @@ public class Experiment implements Serializable {
@Schema(description = "理化所统计") @Schema(description = "理化所统计")
private Integer totalCountLhs; private Integer totalCountLhs;
/**
* 试验报告审核状态，给报告审核页面用，不用存库。
*/
@Schema(description = "理化所统计")
private String reportStatus;
} }

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils; 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.constant.ExperimentStatus;
import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.entity.*;
import org.jeecg.modules.database.mapper.ExperimentMapper; import org.jeecg.modules.database.mapper.ExperimentMapper;
@@ -127,6 +128,13 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
List<ExperimentReport> reportList = experimentReportService.getByExperimentId(experiment.getId()); List<ExperimentReport> reportList = experimentReportService.getByExperimentId(experiment.getId());
if (CollUtil.isNotEmpty(reportList)) { if (CollUtil.isNotEmpty(reportList)) {
experiment.setExperimentReportList(reportList); experiment.setExperimentReportList(reportList);
//给试验报告审核页面显示报告状态
List<ExperimentReport> 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 { } else {
experiment.setExperimentReportList(new ArrayList<>()); experiment.setExperimentReportList(new ArrayList<>());
} }