From bc7388461111d31518eccc104f3116d9daeb89a8 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Wed, 27 Nov 2024 10:05:29 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentController.java       | 18 +++++++++---------
 .../controller/ExperimentReportController.java |  2 +-
 .../IExperimentAnnealProcessService.java       |  4 +++-
 .../IExperimentRadiationProcessService.java    |  4 +++-
 .../service/IExperimentTestProcessService.java |  4 +++-
 .../ExperimentAnnealProcessServiceImpl.java    |  6 ++++--
 .../ExperimentRadiationProcessServiceImpl.java |  6 ++++--
 .../impl/ExperimentTestProcessServiceImpl.java |  6 ++++--
 8 files changed, 31 insertions(+), 19 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 5279939..403e981 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
@@ -210,17 +210,17 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         Experiment copied = old.copy();
         experimentService.save(copied);
 
-        ExperimentAnnealProcess experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId());
-        if (Objects.nonNull(experimentAnnealProcess)) {
-            experimentAnnealProcessService.save(experimentAnnealProcess.copy(copied.getId()));
+        List<ExperimentAnnealProcess> experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId());
+        if (CollUtil.isNotEmpty(experimentAnnealProcess)) {
+            experimentAnnealProcess.forEach(v -> experimentAnnealProcessService.save(v.copy(copied.getId())));
         }
-        ExperimentRadiationProcess experimentRadiationProcess = experimentRadiationProcessService.getByExperimentId(old.getId());
-        if (Objects.nonNull(experimentRadiationProcess)) {
-            experimentRadiationProcessService.save(experimentRadiationProcess.copy(copied.getId()));
+        List<ExperimentRadiationProcess> experimentRadiationProcess = experimentRadiationProcessService.getByExperimentId(old.getId());
+        if (CollUtil.isNotEmpty(experimentRadiationProcess)) {
+            experimentRadiationProcess.forEach(v -> experimentRadiationProcessService.save(v.copy(copied.getId())));
         }
-        ExperimentTestProcess experimentTestProcess = experimentTestProcessService.getByExperimentId(old.getId());
-        if (Objects.nonNull(experimentTestProcess)) {
-            experimentTestProcessService.save(experimentTestProcess.copy(copied.getId()));
+        List<ExperimentTestProcess> experimentTestProcess = experimentTestProcessService.getByExperimentId(old.getId());
+        if (CollUtil.isNotEmpty(experimentTestProcess)) {
+            experimentTestProcess.forEach(v -> experimentTestProcessService.save(v.copy(copied.getId())));
         }
         return Result.OK("复制成功!");
     }
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
index bce28f2..24a6fd4 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
@@ -98,7 +98,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         }
         //ExperimentReport report = experimentReportService.getByExperimentId(experimentId);
         //if (ObjUtil.isNotNull(report)) {
-        //    return Result.error("试验试验报告已存在！");
+        //    return Result.error("试验报告已存在！");
         //}
         experimentReport.setReportName(experiment.getName() + "-试验报告");
         experimentReportService.save(experimentReport);
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 2b0b4bd..fcaee1a 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
@@ -3,6 +3,8 @@ package org.jeecg.modules.database.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
 
+import java.util.List;
+
 /**
  * @Description: 退火过程
  * @Author: jeecg-boot
@@ -10,5 +12,5 @@ import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
  * @Version: V1.0
  */
 public interface IExperimentAnnealProcessService extends IService<ExperimentAnnealProcess> {
-    ExperimentAnnealProcess getByExperimentId(String experimentId);
+    List<ExperimentAnnealProcess> getByExperimentId(String experimentId);
 }
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 d641c2f..c25ae4c 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
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.database.entity.ExperimentAnnealProcess;
 import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
 
+import java.util.List;
+
 /**
  * @Description: 辐照过程
  * @Author: jeecg-boot
@@ -11,6 +13,6 @@ import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
  * @Version: V1.0
  */
 public interface IExperimentRadiationProcessService extends IService<ExperimentRadiationProcess> {
-    ExperimentRadiationProcess getByExperimentId(String experimentId);
+    List<ExperimentRadiationProcess> getByExperimentId(String experimentId);
 
 }
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 6789053..409d1cf 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
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.database.entity.ExperimentRadiationProcess;
 import org.jeecg.modules.database.entity.ExperimentTestProcess;
 
+import java.util.List;
+
 /**
  * @Description: 测试过程
  * @Author: jeecg-boot
@@ -11,6 +13,6 @@ import org.jeecg.modules.database.entity.ExperimentTestProcess;
  * @Version: V1.0
  */
 public interface IExperimentTestProcessService extends IService<ExperimentTestProcess> {
-    ExperimentTestProcess getByExperimentId(String experimentId);
+    List<ExperimentTestProcess> getByExperimentId(String experimentId);
 
 }
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 fdde4b9..3ccb4e4 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
@@ -7,6 +7,8 @@ import org.jeecg.modules.database.mapper.ExperimentAnnealProcessMapper;
 import org.jeecg.modules.database.service.IExperimentAnnealProcessService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 退火过程
  * @Author: jeecg-boot
@@ -18,7 +20,7 @@ public class ExperimentAnnealProcessServiceImpl extends ServiceImpl<ExperimentAn
         implements IExperimentAnnealProcessService {
 
     @Override
-    public ExperimentAnnealProcess getByExperimentId(String experimentId) {
-        return getOne(new LambdaQueryWrapper<ExperimentAnnealProcess>().eq(ExperimentAnnealProcess::getExperimentId, experimentId),false);
+    public List<ExperimentAnnealProcess> getByExperimentId(String experimentId) {
+        return list(new LambdaQueryWrapper<ExperimentAnnealProcess>().eq(ExperimentAnnealProcess::getExperimentId, experimentId));
     }
 }
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 dbe9e79..e1a6a6f 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
@@ -7,6 +7,8 @@ import org.jeecg.modules.database.mapper.ExperimentRadiationProcessMapper;
 import org.jeecg.modules.database.service.IExperimentRadiationProcessService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 辐照过程
  * @Author: jeecg-boot
@@ -18,7 +20,7 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl<Experimen
         implements IExperimentRadiationProcessService {
 
     @Override
-    public ExperimentRadiationProcess getByExperimentId(String experimentId) {
-        return getOne(new LambdaQueryWrapper<ExperimentRadiationProcess>().eq(ExperimentRadiationProcess::getExperimentId, experimentId),false);
+    public List<ExperimentRadiationProcess> getByExperimentId(String experimentId) {
+        return list(new LambdaQueryWrapper<ExperimentRadiationProcess>().eq(ExperimentRadiationProcess::getExperimentId, experimentId));
     }
 }
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 c8818ae..6d6d8ad 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
@@ -7,6 +7,8 @@ import org.jeecg.modules.database.mapper.ExperimentTestProcessMapper;
 import org.jeecg.modules.database.service.IExperimentTestProcessService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @Description: 测试过程
  * @Author: jeecg-boot
@@ -18,7 +20,7 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl<ExperimentTest
         implements IExperimentTestProcessService {
 
     @Override
-    public ExperimentTestProcess getByExperimentId(String experimentId) {
-        return getOne(new LambdaQueryWrapper<ExperimentTestProcess>().eq(ExperimentTestProcess::getExperimentId, experimentId),false);
+    public List<ExperimentTestProcess> getByExperimentId(String experimentId) {
+        return list(new LambdaQueryWrapper<ExperimentTestProcess>().eq(ExperimentTestProcess::getExperimentId, experimentId));
     }
 }