From a10ce1a6f49eb54ee8c7d7dd13b2a4c1d3078ec3 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Mon, 7 Apr 2025 01:40:05 +0800
Subject: [PATCH] update

---
 .../modules/database/controller/ExperimentController.java   | 6 +++---
 .../database/service/IExperimentAnnealProcessService.java   | 2 +-
 .../service/IExperimentRadiationProcessService.java         | 2 +-
 .../database/service/IExperimentTestProcessService.java     | 2 +-
 .../service/impl/ExperimentAnnealProcessServiceImpl.java    | 4 ++--
 .../service/impl/ExperimentRadiationProcessServiceImpl.java | 4 ++--
 .../service/impl/ExperimentTestProcessServiceImpl.java      | 4 ++--
 7 files changed, 12 insertions(+), 12 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 83c9990..0c15ada 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
@@ -270,15 +270,15 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
 
         List<ExperimentAnnealProcess> experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId());
         if (CollUtil.isNotEmpty(experimentAnnealProcess)) {
-            experimentAnnealProcess.forEach(v -> experimentAnnealProcessService.copy(old.getId(),copied.getId()));
+            experimentAnnealProcess.forEach(v -> experimentAnnealProcessService.copy(v.getId(),copied.getId()));
         }
         List<ExperimentRadiationProcess> experimentRadiationProcess = experimentRadiationProcessService.getByExperimentId(old.getId());
         if (CollUtil.isNotEmpty(experimentRadiationProcess)) {
-            experimentRadiationProcess.forEach(v -> experimentRadiationProcessService.copy(old.getId(),copied.getId()));
+            experimentRadiationProcess.forEach(v -> experimentRadiationProcessService.copy(v.getId(),copied.getId()));
         }
         List<ExperimentTestProcess> experimentTestProcess = experimentTestProcessService.getByExperimentId(old.getId());
         if (CollUtil.isNotEmpty(experimentTestProcess)) {
-            experimentTestProcess.forEach(v -> experimentTestProcessService.copy(old.getId(),copied.getId()));
+            experimentTestProcess.forEach(v -> experimentTestProcessService.copy(v.getId(),copied.getId()));
         }
         return Result.OK("复制成功!");
     }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java
index 082ebc9..f07fa0c 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentAnnealProcessService.java
@@ -18,5 +18,5 @@ public interface IExperimentAnnealProcessService extends IService<ExperimentAnne
 
     void saveWithDetails(ExperimentAnnealProcess experimentAnnealProcess);
 
-    void copy(String oldExperimentId,String newExperimentId);
+    void copy(String oldId,String newExperimentId);
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java
index 8b5231a..0f44c4c 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentRadiationProcessService.java
@@ -18,5 +18,5 @@ public interface IExperimentRadiationProcessService extends IService<ExperimentR
 
     void saveWithDetails(ExperimentRadiationProcess experimentRadiationProcess);
 
-    void copy(String oldExperimentId,String newExperimentId);
+    void copy(String oldId, String newExperimentId);
 }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java
index 0d3bb2b..000f357 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentTestProcessService.java
@@ -18,5 +18,5 @@ public interface IExperimentTestProcessService extends IService<ExperimentTestPr
 
     void saveWithDetails(ExperimentTestProcess experimentTestProcess);
 
-    void copy(String oldExperimentId,String newExperimentId);
+    void copy(String oldId,String newExperimentId);
 }
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 8733bc0..3babf27 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
@@ -117,9 +117,9 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
     }
 
     @Override
-    public void copy(String oldExperimentId,String newExperimentId){
+    public void copy(String oldId,String newExperimentId){
         ExperimentAnnealProcess experiment = new ExperimentAnnealProcess();
-        BeanUtil.copyProperties(getByExperimentId(oldExperimentId), experiment);
+        BeanUtil.copyProperties(getById(oldId), experiment);
         experiment.setId(null);
         experiment.setExperimentId(newExperimentId);
         experiment.setAnnealStartTime(null);
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java
index de3fd9e..d5d0e32 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentRadiationProcessServiceImpl.java
@@ -107,9 +107,9 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
     }
 
     @Override
-    public void copy(String oldExperimentId,String newExperimentId) {
+    public void copy(String oldId,String newExperimentId) {
         ExperimentRadiationProcess experiment = new ExperimentRadiationProcess();
-        BeanUtil.copyProperties(getByExperimentId(oldExperimentId), experiment);
+        BeanUtil.copyProperties(getById(oldId), experiment);
         experiment.setId(null);
         experiment.setExperimentId(newExperimentId);
         experiment.setRadiationStartTime(null);
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java
index 1846583..efe3075 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentTestProcessServiceImpl.java
@@ -78,9 +78,9 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTest
     }
 
     @Override
-    public void copy(String oldExperimentId, String newExperimentId) {
+    public void copy(String oldId, String newExperimentId) {
         ExperimentTestProcess experiment = new ExperimentTestProcess();
-        BeanUtil.copyProperties(getByExperimentId(oldExperimentId), experiment);
+        BeanUtil.copyProperties(getById(oldId), experiment);
         experiment.setExperimentId(newExperimentId);
         experiment.setId(null);
         experiment.setTestStartTime(null);