From 71a075236ca9f5761a6b35af6c01f3b783bb9c50 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Fri, 11 Apr 2025 22:25:22 +0800
Subject: [PATCH] update

---
 .../ExperimentAnnealProcessServiceImpl.java   | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

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 49c3904..5cb93ff 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
@@ -113,6 +113,9 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
             List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment,
                     ExperimentDeviationEquipment.class);
             for (ExperimentDeviationEquipment sampleInfo : deviationEquipmentList) {
+                if (StringUtils.equals(type, "add")) {
+                    sampleInfo.setId(null);
+                }
                 experimentDeviationEquipmentService.saveOrUpdate(sampleInfo);
             }
             experimentAnnealProcess.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList));
@@ -123,7 +126,8 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
     @Override
     public void copy(String oldId, String newExperimentId) {
         ExperimentAnnealProcess experiment = new ExperimentAnnealProcess();
-        BeanUtil.copyProperties(getById(oldId), experiment);
+        ExperimentAnnealProcess oldObj = getById(oldId);
+        BeanUtil.copyProperties(oldObj, experiment);
         experiment.setId(null);
         experiment.setExperimentId(newExperimentId);
         experiment.setAnnealStartTime(null);
@@ -135,6 +139,31 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
         } else {
             experiment.setSampleInfo(null);
         }
+
+        // 保存偏置条件信息
+        String deviationCondition = oldObj.getDeviationCondition();
+        if (StringUtils.isNotBlank(deviationCondition)) {
+            List<ExperimentDeviationCondition> deviationConditionList = JSON.parseArray(deviationCondition,
+                    ExperimentDeviationCondition.class);
+            deviationConditionList.forEach(sampleInfo -> {
+                sampleInfo.setId(null);
+                experimentDeviationConditionService.saveOrUpdate(sampleInfo);
+            });
+            experiment.setDeviationCondition(JSON.toJSONString(deviationConditionList));
+        }
+
+        //加偏设备信息
+        String deviationEquipment = oldObj.getDeviationEquipment();
+        if (StringUtils.isNotBlank(deviationEquipment)) {
+            List<ExperimentDeviationEquipment> deviationEquipmentList = JSON.parseArray(deviationEquipment,
+                    ExperimentDeviationEquipment.class);
+            deviationEquipmentList.forEach(sampleInfo -> {
+                sampleInfo.setId(null);
+                experimentDeviationEquipmentService.saveOrUpdate(sampleInfo);
+            });
+            experiment.setDeviationEquipment(JSON.toJSONString(deviationEquipmentList));
+        }
+
         save(experiment);
     }