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

ESCC22500

Browse Source
This commit is contained in:
ls
2025-06-24 21:19:47 +08:00
parent 391dc78839
commit 315df271d3
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentReviewDTO.java
View File

@@ -6,7 +6,10 @@ import java.io.Serializable;
@Data @Data
public class ExperimentReviewDTO implements Serializable { public class ExperimentReviewDTO implements Serializable {
private String experimentId;
private String sampleName; private String sampleName;
private String sampleId;
private String processType; private String processType;
private String reviewResult; private String reviewResult;
} }

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

@@ -48,7 +48,8 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
result.setSampleId(sampleInfo.getId()); result.setSampleId(sampleInfo.getId());
for (int i = 0; i < ruleList.size(); i++) { for (int i = 0; i < ruleList.size(); i++) {
ExperimentReviewRule rule = ruleList.get(i); ExperimentReviewRule rule = ruleList.get(i);
String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo,experimentReview); String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo,
experimentReview);
if (StrUtil.isNotBlank(executeResult)) { if (StrUtil.isNotBlank(executeResult)) {
ExperimentReviewDetail detail = new ExperimentReviewDetail(); ExperimentReviewDetail detail = new ExperimentReviewDetail();
detail.setExperimentId(experiment.getId()); detail.setExperimentId(experiment.getId());
@@ -91,6 +92,8 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
List<ExperimentReviewDTO> result = new ArrayList<>(); List<ExperimentReviewDTO> result = new ArrayList<>();
sampleInfoList.forEach(sampleInfo -> { sampleInfoList.forEach(sampleInfo -> {
ExperimentReviewDTO dto = new ExperimentReviewDTO(); ExperimentReviewDTO dto = new ExperimentReviewDTO();
dto.setExperimentId(experimentId);
dto.setSampleId(sampleInfo.getId());
dto.setSampleName(sampleInfo.getSampleName()); dto.setSampleName(sampleInfo.getSampleName());
ExperimentReview review = getBySampleId(experimentId, sampleInfo.getId()); ExperimentReview review = getBySampleId(experimentId, sampleInfo.getId());
if (Objects.isNull(review)) { if (Objects.isNull(review)) {