physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导出试验时，判断样品列表是否为空

Browse Source
This commit is contained in:
dengchun
2025-05-05 13:17:27 +08:00
parent c8c4b0f7fc
commit af5b8bda5f
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
View File

@@ -464,28 +464,30 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
List<ExperimentSampleInfo> sampleInfoList = v.getSampleInfoList(); List<ExperimentSampleInfo> sampleInfoList = v.getSampleInfoList();
List<ExperimentDeviationEquipment> deviationEquipmentList = v.getDeviationEquipmentList(); List<ExperimentDeviationEquipment> deviationEquipmentList = v.getDeviationEquipmentList();
List<ExperimentDeviationCondition> deviationConditionList = v.getDeviationConditionList(); List<ExperimentDeviationCondition> deviationConditionList = v.getDeviationConditionList();
for (int j = 0; j < sampleInfoList.size(); j++) { if (CollUtil.isNotEmpty(sampleInfoList)) {
ExperimentSampleInfo sampleInfo = sampleInfoList.get(j); for (int j = 0; j < sampleInfoList.size(); j++) {
AnnealProcessExportDTO annealProcessExportDTO = new AnnealProcessExportDTO(); ExperimentSampleInfo sampleInfo = sampleInfoList.get(j);
AnnealProcessExportDTO annealProcessExportDTO = new AnnealProcessExportDTO();
if (CollUtil.isNotEmpty(deviationConditionList) && deviationConditionList.size() > j && ObjUtil.isNotNull( if (CollUtil.isNotEmpty(deviationConditionList) && deviationConditionList.size() > j && ObjUtil.isNotNull(
deviationConditionList.get(j)) deviationConditionList.get(j))
) { ) {
BeanUtil.copyProperties(deviationConditionList.get(j), annealProcessExportDTO); BeanUtil.copyProperties(deviationConditionList.get(j), annealProcessExportDTO);
} }
if (CollUtil.isNotEmpty(deviationEquipmentList) && deviationEquipmentList.size() > j && ObjUtil.isNotNull( if (CollUtil.isNotEmpty(deviationEquipmentList) && deviationEquipmentList.size() > j && ObjUtil.isNotNull(
deviationEquipmentList.get(j)) deviationEquipmentList.get(j))
) { ) {
BeanUtil.copyProperties(deviationEquipmentList.get(j), annealProcessExportDTO); BeanUtil.copyProperties(deviationEquipmentList.get(j), annealProcessExportDTO);
} }
annealProcessExportDTO.setSampleName(sampleInfo.getSampleName()); annealProcessExportDTO.setSampleName(sampleInfo.getSampleName());
annealProcessExportDTO.setSampleModel(sampleInfo.getSampleModel()); annealProcessExportDTO.setSampleModel(sampleInfo.getSampleModel());
annealProcessExportDTO.setSampleType(sampleInfo.getSampleType()); annealProcessExportDTO.setSampleType(sampleInfo.getSampleType());
annealProcessExportDTO.setAnnealTemperature(v.getAnnealTemperature()); annealProcessExportDTO.setAnnealTemperature(v.getAnnealTemperature());
annealProcessExportDTO.setAnnealStartTime(DateUtils.formatDate(v.getAnnealStartTime(), "yyyy-MM-dd HH:mm")); annealProcessExportDTO.setAnnealStartTime(DateUtils.formatDate(v.getAnnealStartTime(), "yyyy-MM-dd HH:mm"));
annealProcessExportDTO.setAnnealEndTime(DateUtils.formatDate(v.getAnnealEndTime(), "yyyy-MM-dd HH:mm")); annealProcessExportDTO.setAnnealEndTime(DateUtils.formatDate(v.getAnnealEndTime(), "yyyy-MM-dd HH:mm"));
annealProcessList.add(annealProcessExportDTO); annealProcessList.add(annealProcessExportDTO);
}
} }
}); });
} }