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:46:23 +08:00
parent 315df271d3
commit a84d24380a
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,12 +68,17 @@ public class ExperimentReview implements Serializable {
@Excel(name = "试验ID", width = 15) @Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID") @Schema(description = "试验ID")
private String experimentId; private String experimentId;
@TableField(exist = false)
private String experimentName;
/** /**
* 样品ID * 样品ID
*/ */
@Excel(name = "样品ID", width = 15) @Excel(name = "样品ID", width = 15)
@Schema(description = "样品ID") @Schema(description = "样品ID")
private String sampleId; private String sampleId;
@TableField(exist = false)
private String sampleName;
/** /**
* 试验流程标准 * 试验流程标准
*/ */

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

@@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@@ -58,10 +56,14 @@ public class ExperimentReviewDetail implements Serializable {
@Excel(name = "试验ID", width = 15) @Excel(name = "试验ID", width = 15)
@Schema(description = "试验ID") @Schema(description = "试验ID")
private String experimentId; private String experimentId;
@TableField(exist = false)
private String experimentName;
/**样品ID*/ /**样品ID*/
@Excel(name = "样品ID", width = 15) @Excel(name = "样品ID", width = 15)
@Schema(description = "样品ID") @Schema(description = "样品ID")
private String sampleId; private String sampleId;
@TableField(exist = false)
private String sampleName;
/**试验流程标准*/ /**试验流程标准*/
@Excel(name = "试验流程标准", width = 15) @Excel(name = "试验流程标准", width = 15)
@Schema(description = "试验流程标准") @Schema(description = "试验流程标准")

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

@@ -44,8 +44,10 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
List<ExperimentReviewRule> ruleList = experimentReviewRuleService.getByType(processType); List<ExperimentReviewRule> ruleList = experimentReviewRuleService.getByType(processType);
ExperimentReview result = new ExperimentReview(); ExperimentReview result = new ExperimentReview();
result.setExperimentId(experiment.getId()); result.setExperimentId(experiment.getId());
result.setExperimentName(experiment.getName());
result.setProcessType(processType); result.setProcessType(processType);
result.setSampleId(sampleInfo.getId()); result.setSampleId(sampleInfo.getId());
result.setSampleName(sampleInfo.getSampleName());
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, String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo,
@@ -53,7 +55,9 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
if (StrUtil.isNotBlank(executeResult)) { if (StrUtil.isNotBlank(executeResult)) {
ExperimentReviewDetail detail = new ExperimentReviewDetail(); ExperimentReviewDetail detail = new ExperimentReviewDetail();
detail.setExperimentId(experiment.getId()); detail.setExperimentId(experiment.getId());
detail.setExperimentName(experiment.getName());
detail.setSampleId(sampleInfo.getId()); detail.setSampleId(sampleInfo.getId());
detail.setSampleName(sampleInfo.getSampleName());
detail.setProcessType(processType); detail.setProcessType(processType);
detail.setRuleId(rule.getId()); detail.setRuleId(rule.getId());
detail.setPriority(rule.getPriority()); detail.setPriority(rule.getPriority());