From 1e51af385909adcb72b97e96edcbbb0412fa7de4 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期一, 28 八月 2023 09:08:45 +0800 Subject: [PATCH] 多次评定初版 --- src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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 93de098..7d5b191 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 @@ -13,6 +13,7 @@ import com.gkhy.labRiskManage.commons.exception.BusinessException; import com.gkhy.labRiskManage.commons.model.PageQuery; import com.gkhy.labRiskManage.commons.utils.BeanCopyUtils; +import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog; import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentInfo; import com.gkhy.labRiskManage.domain.experiment.enums.ExperimentStatusEnum; import com.gkhy.labRiskManage.domain.experiment.enums.ExperimentTagEnum; @@ -53,7 +54,8 @@ private ExperimentAndEmergencyService experimentAndEmergencyService; @Autowired private ExperimentAppConverter experimentAppConverter; - + @Autowired + private ExperimentAssessLogService experimentAssessLogService; @Transactional @Override public int save(Long currentUserId, ExperimentInsertReqBO experimentInsertReqBO) { @@ -174,6 +176,12 @@ BeanUtils.copyProperties(searchResult,result); } List<ExperimentInfoDTO> experimentInfoDTOS = (List<ExperimentInfoDTO>)searchResult.getData(); + for (ExperimentInfoDTO experimentInfo : experimentInfoDTOS) { + List<ExperimentAssessLog> assessLogs = experimentAssessLogService.getAssessLogs(experimentInfo.getExperimentCode()); + if (assessLogs.size() > 0){ + experimentInfo.setExperimentAssessLogs(assessLogs); + } + } result.setData(getExperimentInfoAppQueryDTO(experimentInfoDTOS)); //获取分页数据 -- Gitblit v1.9.2