From fe24ec3a118ec998997c6d647e99de450a482381 Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Fri, 2 May 2025 09:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E7=81=AB=E8=AE=BE=E5=A4=87=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=93=81=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E5=81=8F=E7=BD=AE=E6=9D=A1=E4=BB=B6=E5=88=97=E8=A1=A8=E3=80=81?=
 =?UTF-8?q?=E9=80=80=E7=81=AB=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=83=BD=E4=B8=8D=E5=8A=A0=E5=B7=A5=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=89=8D=E7=AB=AF=E4=BC=A0=E8=BF=87=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84json=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ExperimentAnnealProcessServiceImpl.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
index c53d93a..784fa08 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentAnnealProcessServiceImpl.java
@@ -82,6 +82,8 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
     @Override
     public void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess, String type) {
         // 保存样品信息
+        // 20250502 - 邓春: 不修改前端 传过来的样品信息列表
+/*
         List<ExperimentSampleInfo> sampleInfoList = experimentAnnealProcess.getSampleInfoList();
         List<String> sampleInfoIds = new ArrayList<>();
         if (CollUtil.isNotEmpty(sampleInfoList)) {
@@ -92,9 +94,11 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
             }
         }
         experimentAnnealProcess.setSampleInfo(StringUtils.join(sampleInfoIds, ","));
+*/
 
         // 保存偏置条件信息
-        String deviationCondition = experimentAnnealProcess.getDeviationCondition();
+        // 20250502 - 邓春: 不修改前端 传过来的退火设备大字段
+  /*      String deviationCondition = experimentAnnealProcess.getDeviationCondition();
         if (StringUtils.isNotBlank(deviationCondition)) {
             List<ExperimentDeviationCondition> deviationConditionList = JSON.parseArray(deviationCondition,
                     ExperimentDeviationCondition.class);
@@ -106,10 +110,11 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
                 experimentDeviationConditionService.saveOrUpdate(sampleInfo);
             }
             experimentAnnealProcess.setDeviationCondition(JSON.toJSONString(deviationConditionList));
-        }
+        }*/
 
         //加偏设备信息
-        String deviationEquipment = experimentAnnealProcess.getDeviationEquipment();
+        //20250502 - 邓春:不修改前端 传过来的退火设备大字段
+/*        String deviationEquipment = experimentAnnealProcess.getDeviationEquipment();
         if (StringUtils.isNotBlank(deviationEquipment)) {
             List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment,
                     ExperimentDeviationEquipment.class);
@@ -121,7 +126,7 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
                 experimentDeviationEquipmentService.saveOrUpdate(sampleInfo);
             }
             experimentAnnealProcess.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList));
-        }
+        }*/
         saveOrUpdate(experimentAnnealProcess);
     }