From af5b8bda5ff596306e9d91cc84c753f39b2044e8 Mon Sep 17 00:00:00 2001 From: dengchun Date: Mon, 5 May 2025 13:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AF=95=E9=AA=8C=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E6=A0=B7=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExperimentController.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 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 bbde7e2..ce01a8a 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 @@ -464,28 +464,30 @@ public class ExperimentController extends JeecgController sampleInfoList = v.getSampleInfoList(); List deviationEquipmentList = v.getDeviationEquipmentList(); List deviationConditionList = v.getDeviationConditionList(); - for (int j = 0; j < sampleInfoList.size(); j++) { - ExperimentSampleInfo sampleInfo = sampleInfoList.get(j); - AnnealProcessExportDTO annealProcessExportDTO = new AnnealProcessExportDTO(); + if (CollUtil.isNotEmpty(sampleInfoList)) { + for (int j = 0; j < sampleInfoList.size(); j++) { + ExperimentSampleInfo sampleInfo = sampleInfoList.get(j); + AnnealProcessExportDTO annealProcessExportDTO = new AnnealProcessExportDTO(); - if (CollUtil.isNotEmpty(deviationConditionList) && deviationConditionList.size() > j && ObjUtil.isNotNull( - deviationConditionList.get(j)) - ) { - BeanUtil.copyProperties(deviationConditionList.get(j), annealProcessExportDTO); - } - if (CollUtil.isNotEmpty(deviationEquipmentList) && deviationEquipmentList.size() > j && ObjUtil.isNotNull( - deviationEquipmentList.get(j)) - ) { - BeanUtil.copyProperties(deviationEquipmentList.get(j), annealProcessExportDTO); - } + if (CollUtil.isNotEmpty(deviationConditionList) && deviationConditionList.size() > j && ObjUtil.isNotNull( + deviationConditionList.get(j)) + ) { + BeanUtil.copyProperties(deviationConditionList.get(j), annealProcessExportDTO); + } + if (CollUtil.isNotEmpty(deviationEquipmentList) && deviationEquipmentList.size() > j && ObjUtil.isNotNull( + deviationEquipmentList.get(j)) + ) { + BeanUtil.copyProperties(deviationEquipmentList.get(j), annealProcessExportDTO); + } - annealProcessExportDTO.setSampleName(sampleInfo.getSampleName()); - annealProcessExportDTO.setSampleModel(sampleInfo.getSampleModel()); - annealProcessExportDTO.setSampleType(sampleInfo.getSampleType()); - annealProcessExportDTO.setAnnealTemperature(v.getAnnealTemperature()); - annealProcessExportDTO.setAnnealStartTime(DateUtils.formatDate(v.getAnnealStartTime(), "yyyy-MM-dd HH:mm")); - annealProcessExportDTO.setAnnealEndTime(DateUtils.formatDate(v.getAnnealEndTime(), "yyyy-MM-dd HH:mm")); - annealProcessList.add(annealProcessExportDTO); + annealProcessExportDTO.setSampleName(sampleInfo.getSampleName()); + annealProcessExportDTO.setSampleModel(sampleInfo.getSampleModel()); + annealProcessExportDTO.setSampleType(sampleInfo.getSampleType()); + annealProcessExportDTO.setAnnealTemperature(v.getAnnealTemperature()); + annealProcessExportDTO.setAnnealStartTime(DateUtils.formatDate(v.getAnnealStartTime(), "yyyy-MM-dd HH:mm")); + annealProcessExportDTO.setAnnealEndTime(DateUtils.formatDate(v.getAnnealEndTime(), "yyyy-MM-dd HH:mm")); + annealProcessList.add(annealProcessExportDTO); + } } }); }