From b6378d97248bfe308bb7d5ef38c5fb646622a5a7 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Wed, 23 Jul 2025 23:00:15 +0800
Subject: [PATCH] review

---
 .../service/executor/ESCC225001Executor.java   | 14 ++++++++------
 .../service/executor/ESCC2290006Executor.java  | 18 ++++++++++--------
 .../service/executor/GJB548C10Executor.java    | 14 ++++++++------
 .../service/executor/QJ1000410Executor.java    | 14 ++++++++------
 .../impl/ExperimentReviewServiceImpl.java      |  3 +++
 5 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java
index f299513..5dc8510 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC225001Executor.java
@@ -63,12 +63,14 @@ public class ESCC225001Executor extends BaseExecutor implements IExperimentRevie
         List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
         for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
             String deviationCondition = experimentAnnealProcess.getDeviationCondition();
-            JSONObject jsonObject = JSON.parseObject(deviationCondition);
-            if (jsonObject.containsKey("offsetCondition")) {
-                String offsetCondition = jsonObject.getString("offsetCondition");
-                if (StringUtils.contains(offsetCondition, "dtpz") || StringUtils.contains(offsetCondition, "jtpz")) {
-                    condition2 = true;
-                    break;
+            List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
+            for (JSONObject s : jsonArray) {
+                if (s.containsKey("offsetCondition")) {
+                    String offsetCondition = s.getString("offsetCondition");
+                    if (StringUtils.contains(offsetCondition, "dtpz") || StringUtils.contains(offsetCondition, "jtpz")) {
+                        condition2 = true;
+                        break;
+                    }
                 }
             }
         }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java
index 3ee8a5d..a0e3348 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/ESCC2290006Executor.java
@@ -4,8 +4,7 @@
  */
 package org.jeecg.modules.database.service.executor;
 
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.*;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.modules.database.constant.ExperimentReviewProcessType;
 import org.jeecg.modules.database.constant.ExperimentReviewResultEnum;
@@ -57,14 +56,17 @@ public class ESCC2290006Executor extends BaseExecutor implements IExperimentRevi
         List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
         for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
             String deviationCondition = experimentAnnealProcess.getDeviationCondition();
-            JSONObject jsonObject = JSON.parseObject(deviationCondition);
-            if (jsonObject.containsKey("offsetCondition")) {
-                String offsetCondition = jsonObject.getString("offsetCondition");
-                if (StringUtils.contains(offsetCondition, "dtpz")) {
-                    condition1 = true;
-                    break;
+            List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
+            for (JSONObject s : jsonArray) {
+                if (s.containsKey("offsetCondition")) {
+                    String offsetCondition = s.getString("offsetCondition");
+                    if (StringUtils.contains(offsetCondition, "dtpz")) {
+                        condition1 = true;
+                        break;
+                    }
                 }
             }
+
         }
         if (condition1) {
             return ExperimentReviewResultEnum.HIGH;
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java
index c73d31b..73298b7 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/GJB548C10Executor.java
@@ -57,12 +57,14 @@ public class GJB548C10Executor extends BaseExecutor implements IExperimentReview
         List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
         for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
             String deviationCondition = experimentAnnealProcess.getDeviationCondition();
-            JSONObject jsonObject = JSON.parseObject(deviationCondition);
-            if (jsonObject.containsKey("offsetCondition")) {
-                String offsetCondition = jsonObject.getString("offsetCondition");
-                if (StringUtils.contains(offsetCondition, "dtpz")) {
-                    condition1 = true;
-                    break;
+            List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
+            for (JSONObject s : jsonArray) {
+                if (s.containsKey("offsetCondition")) {
+                    String offsetCondition = s.getString("offsetCondition");
+                    if (StringUtils.contains(offsetCondition, "dtpz")) {
+                        condition1 = true;
+                        break;
+                    }
                 }
             }
         }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java
index 6e89a12..107c2b8 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/executor/QJ1000410Executor.java
@@ -57,12 +57,14 @@ public class QJ1000410Executor extends BaseExecutor implements IExperimentReview
         List<ExperimentAnnealProcess> experimentAnnealProcessList = experimentAnnealProcessService.getByExperimentId(experiment.getId());
         for (ExperimentAnnealProcess experimentAnnealProcess : experimentAnnealProcessList) {
             String deviationCondition = experimentAnnealProcess.getDeviationCondition();
-            JSONObject jsonObject = JSON.parseObject(deviationCondition);
-            if (jsonObject.containsKey("offsetCondition")) {
-                String offsetCondition = jsonObject.getString("offsetCondition");
-                if (StringUtils.contains(offsetCondition, "dtpz")) {
-                    condition1 = true;
-                    break;
+            List<JSONObject> jsonArray = JSON.parseArray(deviationCondition, JSONObject.class);
+            for (JSONObject s : jsonArray) {
+                if (s.containsKey("offsetCondition")) {
+                    String offsetCondition = s.getString("offsetCondition");
+                    if (StringUtils.contains(offsetCondition, "dtpz")) {
+                        condition1 = true;
+                        break;
+                    }
                 }
             }
         }
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 796f698..a829504 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
@@ -48,6 +48,9 @@ public class ExperimentReviewServiceImpl extends ServiceImpl<ExperimentReviewRes
         result.setProcessType(processType);
         result.setSampleId(sampleInfo.getId());
         result.setSampleName(sampleInfo.getSampleName());
+        result.setNeedAnneal(experimentReview.getNeedAnneal());
+        result.setNeedBurnin(experimentReview.getNeedBurnin());
+        result.setNeedRadiation(experimentReview.getNeedRadiation());
         for (int i = 0; i < ruleList.size(); i++) {
             ExperimentReviewRule rule = ruleList.get(i);
             String executeResult = executorHolder.execute(rule.getProcessType() + rule.getPriority(), experiment, sampleInfo,