16639036659
2023-08-28 8f76ba99a6d20fb5ca45b6029a47d59cb8efe7bb
初步测试完成
已修改3个文件
16 ■■■■■ 文件已修改
src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportExperimentRiskSourceServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java
@@ -268,6 +268,13 @@
        }
        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));
        //获取分页数据
        return result;
@@ -291,6 +298,13 @@
        }
        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));
        //获取分页数据
        return result;
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportExperimentRiskSourceServiceImpl.java
@@ -76,6 +76,7 @@
            riskSource.setUpdateTime(date);
            riskSource.setCreateByUserId(currentUserId);
            riskSource.setUpdateByUserId(currentUserId);
            riskSource.setDescription(sourceInsertBO.getDesc());
            riskSource.setDeleteStatus(StatusEnum.DELETE_NOT.getCode().byteValue());
            riskSourceLists.add(riskSource);
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java
@@ -555,7 +555,6 @@
        reportById.setAssessPerson(reportUpdateBO.getAssessPerson());
        reportById.setAssessLevel(reportUpdateBO.getAssessLevel());
//        reportById.setSafeRiskAnalysis(reportUpdateBO.getSafeRiskAnalysis());
        reportById.setDescription(reportUpdateBO.getDescription());
        reportById.setUpdateTime(LocalDateTime.now());
        reportById.setUpdateByUserId(currentUserId);