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 1e0ef19..83c9990 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 experimentAnnealProcess = experimentAnnealProcessService.getByExperimentId(old.getId()); if (CollUtil.isNotEmpty(experimentAnnealProcess)) { - experimentAnnealProcess.forEach(v -> experimentAnnealProcessService.copy(copied.getId())); + experimentAnnealProcess.forEach(v -> experimentAnnealProcessService.copy(old.getId(),copied.getId())); } List experimentRadiationProcess = experimentRadiationProcessService.getByExperimentId(old.getId()); if (CollUtil.isNotEmpty(experimentRadiationProcess)) { - experimentRadiationProcess.forEach(v -> experimentRadiationProcessService.copy(copied.getId())); + experimentRadiationProcess.forEach(v -> experimentRadiationProcessService.copy(old.getId(),copied.getId())); } List experimentTestProcess = experimentTestProcessService.getByExperimentId(old.getId()); if (CollUtil.isNotEmpty(experimentTestProcess)) { - experimentTestProcess.forEach(v -> experimentTestProcessService.copy(copied.getId())); + experimentTestProcess.forEach(v -> experimentTestProcessService.copy(old.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 71df770..082ebc9 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 sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId); + List sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId); if (CollUtil.isNotEmpty(sampleInfoList)) { experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining())); } else { 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 c6d9cb5..76c2f1e 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,11 +107,11 @@ public class ExperimentRadiationProcessServiceImpl extends ServiceImpl sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId); + List sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId); if (CollUtil.isNotEmpty(sampleInfoList)) { experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining())); } else { 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 9673f77..79ceaab 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,14 +78,14 @@ public class ExperimentTestProcessServiceImpl extends ServiceImpl sampleInfoList = experimentSampleInfoService.getByExperimentId(experimentId); + List sampleInfoList = experimentSampleInfoService.getByExperimentId(newExperimentId); if (CollUtil.isNotEmpty(sampleInfoList)) { experiment.setSampleInfo(sampleInfoList.stream().map(v -> v.getId()).collect(Collectors.joining())); } else {