From 761bdc5b3f17df62aae1b424f2d2dabc11e844bc Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 23 五月 2025 09:33:44 +0800
Subject: [PATCH] 变动大幅度版本
---
src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java
index 548068d..3ac3d79 100644
--- a/src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java
@@ -314,6 +314,7 @@
if (!ObjectUtils.isEmpty(byExperimentId)){
experimentInfo.setAssessLevel(byExperimentId.getAssessLevel());
experimentInfo.setAssessTime(byExperimentId.getAssessTime());
+ experimentInfo.setReportId(byExperimentId.getId());
}
List<ExperimentAndTypeDTO> types = experimentInfo.getTypes();
if (!CollectionUtils.isEmpty(types)){
@@ -487,12 +488,12 @@
for (ExperimentInfoDTO experimentInfoDTO:experimentInfoDTOS){
ExperimentInfoAppQueryDTO experimentInfoAppQueryDTO = new ExperimentInfoAppQueryDTO();
BeanUtils.copyProperties(experimentInfoDTO,experimentInfoAppQueryDTO);
- //实验场所
- List<ExperimentAndSiteAppQueryDTO> siteAppQueryDTOs = new ArrayList<>();
- if(!ObjectUtils.isEmpty(experimentInfoDTO.getSites())){
- siteAppQueryDTOs = BeanCopyUtils.copyBeanList(experimentInfoDTO.getSites(),ExperimentAndSiteAppQueryDTO.class);
- }
- experimentInfoAppQueryDTO.setSites(siteAppQueryDTOs);
+// //实验场所
+// List<ExperimentAndSiteAppQueryDTO> siteAppQueryDTOs = new ArrayList<>();
+// if(!ObjectUtils.isEmpty(experimentInfoDTO.getSites())){
+// siteAppQueryDTOs = BeanCopyUtils.copyBeanList(experimentInfoDTO.getSites(),ExperimentAndSiteAppQueryDTO.class);
+// }
+// experimentInfoAppQueryDTO.setSites(siteAppQueryDTOs);
//人员
List<ExperimentAndPersonAppQueryDTO> personAppQueryDTOList = new ArrayList<>();
if(!ObjectUtils.isEmpty(experimentInfoDTO.getPersons())){
--
Gitblit v1.9.2