From a84d24380ac51c265b539769d89a6da16f566acc Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 24 Jun 2025 21:46:23 +0800
Subject: [PATCH] ESCC22500

---
 .../modules/database/entity/ExperimentReview.java      |  5 +++++
 .../database/entity/ExperimentReviewDetail.java        | 10 ++++++----
 .../service/impl/ExperimentReviewServiceImpl.java      |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java
index e147b71..7f163cb 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReview.java
@@ -68,12 +68,17 @@ public class ExperimentReview implements Serializable {
     @Excel(name = "试验ID", width = 15)
     @Schema(description = "试验ID")
     private String experimentId;
+    @TableField(exist = false)
+    private String experimentName;
     /**
      * 样品ID
      */
     @Excel(name = "样品ID", width = 15)
     @Schema(description = "样品ID")
     private String sampleId;
+
+    @TableField(exist = false)
+    private String sampleName;
     /**
      * 试验流程标准
      */
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewDetail.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewDetail.java
index c7ebebb..9f848c7 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewDetail.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReviewDetail.java
@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -58,10 +56,14 @@ public class ExperimentReviewDetail implements Serializable {
 	@Excel(name = "试验ID", width = 15)
     @Schema(description = "试验ID")
     private String experimentId;
+    @TableField(exist = false)
+    private String experimentName;
 	/**样品ID*/
 	@Excel(name = "样品ID", width = 15)
     @Schema(description = "样品ID")
     private String sampleId;
+    @TableField(exist = false)
+    private String sampleName;
 	/**试验流程标准*/
 	@Excel(name = "试验流程标准", width = 15)
     @Schema(description = "试验流程标准")
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
index ec8a1dc..7c7c3f7 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentReviewServiceImpl.java
@@ -44,8 +44,10 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
         List<ExperimentReviewRule> ruleList = experimentReviewRuleService.getByType(processType);
         ExperimentReview result = new ExperimentReview();
         result.setExperimentId(experiment.getId());
+        result.setExperimentName(experiment.getName());
         result.setProcessType(processType);
         result.setSampleId(sampleInfo.getId());
+        result.setSampleName(sampleInfo.getSampleName());
         for (int i = 0; i < ruleList.size(); i++) {
             ExperimentReviewRule rule = ruleList.get(i);
             String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo,
@@ -53,7 +55,9 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
             if (StrUtil.isNotBlank(executeResult)) {
                 ExperimentReviewDetail detail = new ExperimentReviewDetail();
                 detail.setExperimentId(experiment.getId());
+                detail.setExperimentName(experiment.getName());
                 detail.setSampleId(sampleInfo.getId());
+                detail.setSampleName(sampleInfo.getSampleName());
                 detail.setProcessType(processType);
                 detail.setRuleId(rule.getId());
                 detail.setPriority(rule.getPriority());