From 946ca495daf6dd1409ff81e4de9c230c774a0844 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期五, 10 十一月 2023 16:20:16 +0800 Subject: [PATCH] 风险等级问题处理,检索条件 --- src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 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 df6ab53..02e1d60 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 @@ -22,6 +22,7 @@ import com.gkhy.labRiskManage.domain.experiment.enums.TimeoutEnum; import com.gkhy.labRiskManage.domain.experiment.model.dto.ExperimentInfoDTO; import com.gkhy.labRiskManage.domain.experiment.service.*; +import com.gkhy.labRiskManage.domain.riskReport.entity.ReportRiskAssessInfo; import com.gkhy.labRiskManage.domain.riskReport.service.ReportRiskAssessInfoService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -176,14 +177,21 @@ BeanUtils.copyProperties(searchResult,result); } List<ExperimentInfoDTO> experimentInfoDTOS = (List<ExperimentInfoDTO>)searchResult.getData(); - for (ExperimentInfoDTO experimentInfo : experimentInfoDTOS) { + List<ExperimentInfoAppQueryDTO> experimentInfoAppQueryDTOS = BeanCopyUtils.copyBeanList(experimentInfoDTOS, ExperimentInfoAppQueryDTO.class); + + for (ExperimentInfoAppQueryDTO experimentInfo : experimentInfoAppQueryDTOS) { List<ExperimentAssessLog> assessLogs = experimentAssessLogService.getAssessLogs(experimentInfo.getExperimentCode()); if (assessLogs.size() > 0){ experimentInfo.setExperimentAssessLogs(assessLogs); } + ReportRiskAssessInfo byExperimentId = reportRiskAssessInfoService.getByExperimentId(experimentInfo.getId()); + if (!ObjectUtils.isEmpty(byExperimentId)){ + experimentInfo.setAssessLevel(byExperimentId.getAssessLevel()); + experimentInfo.setAssessTime(byExperimentId.getAssessTime()); + } } - result.setData(getExperimentInfoAppQueryDTO(experimentInfoDTOS)); + result.setData(experimentInfoAppQueryDTOS); //获取分页数据 return result; } @@ -267,15 +275,21 @@ BeanUtils.copyProperties(searchResult,result); } List<ExperimentInfoDTO> experimentInfoDTOS = (List<ExperimentInfoDTO>)searchResult.getData(); + List<ExperimentInfoAppQueryDTO> experimentInfoAppQueryDTOS = BeanCopyUtils.copyBeanList(experimentInfoDTOS, ExperimentInfoAppQueryDTO.class); - for (ExperimentInfoDTO experimentInfo : experimentInfoDTOS) { + for (ExperimentInfoAppQueryDTO experimentInfo : experimentInfoAppQueryDTOS) { List<ExperimentAssessLog> assessLogs = experimentAssessLogService.getAssessLogs(experimentInfo.getExperimentCode()); if (assessLogs.size() > 0){ experimentInfo.setExperimentAssessLogs(assessLogs); } + ReportRiskAssessInfo byExperimentId = reportRiskAssessInfoService.getByExperimentId(experimentInfo.getId()); + if (!ObjectUtils.isEmpty(byExperimentId)){ + experimentInfo.setAssessLevel(byExperimentId.getAssessLevel()); + experimentInfo.setAssessTime(byExperimentId.getAssessTime()); + } } - result.setData(getExperimentInfoAppQueryDTO(experimentInfoDTOS)); + result.setData(experimentInfoAppQueryDTOS); //获取分页数据 return result; } @@ -297,15 +311,21 @@ BeanUtils.copyProperties(searchResult,result); } List<ExperimentInfoDTO> experimentInfoDTOS = (List<ExperimentInfoDTO>)searchResult.getData(); + List<ExperimentInfoAppQueryDTO> experimentInfoAppQueryDTOS = BeanCopyUtils.copyBeanList(experimentInfoDTOS, ExperimentInfoAppQueryDTO.class); - for (ExperimentInfoDTO experimentInfo : experimentInfoDTOS) { + for (ExperimentInfoAppQueryDTO experimentInfo : experimentInfoAppQueryDTOS) { List<ExperimentAssessLog> assessLogs = experimentAssessLogService.getAssessLogs(experimentInfo.getExperimentCode()); if (assessLogs.size() > 0){ experimentInfo.setExperimentAssessLogs(assessLogs); } + ReportRiskAssessInfo byExperimentId = reportRiskAssessInfoService.getByExperimentId(experimentInfo.getId()); + if (!ObjectUtils.isEmpty(byExperimentId)){ + experimentInfo.setAssessLevel(byExperimentId.getAssessLevel()); + experimentInfo.setAssessTime(byExperimentId.getAssessTime()); + } } - result.setData(getExperimentInfoAppQueryDTO(experimentInfoDTOS)); + result.setData(experimentInfoAppQueryDTOS); //获取分页数据 return result; } -- Gitblit v1.9.2