From 274c2618addb9e79cb873da5bd2427e74da80987 Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sun, 18 May 2025 21:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E5=88=97=E8=A1=A8=E5=8C=BA?=
 =?UTF-8?q?=E5=88=86=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=92=8C=E6=8A=A5=E5=91=8A=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ExperimentController.java       | 18 ------------------
 .../modules/database/entity/Experiment.java    |  7 +++++++
 .../database/mapper/xml/ExperimentMapper.xml   | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index 823d5db..6537284 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -156,24 +156,6 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
             return Result.error(result);
         }
 
-        //TODO: 0518 暂时注释掉
-   /*     List<ExperimentSampleInfo> sampleInfoList = experiment.getSampleInfoList();
-        List<ExperimentIrradiationBoard> irradiationBoardList = experiment.getIrradiationBoardList();
-        List<ExperimentDeviationCondition> deviationConditionList = experiment.getDeviationConditionList();
-        List<ExperimentDeviationEquipment> deviationEquipmentList = experiment.getDeviationEquipmentList();
-        Set<String> sampleList = sampleInfoList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
-        Set<String> boardList = irradiationBoardList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
-        Set<String> conditionList = deviationConditionList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
-        Set<String> equipmentList = deviationEquipmentList.stream().map(v -> v.getSampleModel()).collect(Collectors.toUnmodifiableSet());
-        if (!sampleList.equals(boardList)) {
-            return Result.error("辐照板信息不匹配！");
-        }
-        if (!sampleList.equals(conditionList)) {
-            return Result.error("偏置条件信息不匹配！");
-        }
-        if (!sampleList.equals(equipmentList)) {
-            return Result.error("加偏设备信息不匹配！");
-        }*/
         experiment.setStatus(ExperimentStatus.PRE_TEST);
         experimentService.saveWithDetail(experiment);
 
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 fb82f8c..148151f 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
@@ -241,4 +241,11 @@ public class Experiment implements Serializable {
     @TableField(exist = false)
     private String reportStatus;
 
+    /**
+     * 数据是给哪个页面用的，用来区分试验管理和报告审核
+     */
+    @Schema(description = "试验页面")
+    @TableField(exist = false)
+    private String pageName;
+
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
index d32515d..0f5db5c 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
@@ -10,9 +10,18 @@
         left join experiment_deviation_equipment d on d.experiment_id = e.id
         left join experiment_report r on r.experiment_id = e.id
         <where>
-            ( e.supervisor=#{loginUser.id} or e.create_by=#{loginUser.username} or 'admin'=#{loginUser.username}
-            or (r.auditor=#{loginUser.id} and r.status='PROOFREAD_PASS') or (r.proofreader=#{loginUser.id} and r.status='INIT')
-            or (r.confirmer=#{loginUser.id} and r.status='AUDIT_PASS' ))
+            <choose>
+                <when test="#{experiment.pageName} == 'audit'">
+                    AND (r.auditor=#{loginUser.id} and r.status='PROOFREAD_PASS') or (r.proofreader=#{loginUser.id} and r.status='INIT')
+                    or (r.confirmer=#{loginUser.id} and r.status='AUDIT_PASS' ))
+                </when>
+                <otherwise>
+                    AND ( e.supervisor=#{loginUser.id} or e.create_by=#{loginUser.username} or 'admin'=#{loginUser.username}
+                    or (r.auditor=#{loginUser.id} and r.status='PROOFREAD_PASS') or (r.proofreader=#{loginUser.id} and r.status='INIT')
+                    or (r.confirmer=#{loginUser.id} and r.status='AUDIT_PASS' ))
+                </otherwise>
+            </choose>
+
             <if test="experiment.name != null and experiment.name != ''">
                 and e.name like concat('%', #{experiment.name}, '%')
             </if>