From 8f76ba99a6d20fb5ca45b6029a47d59cb8efe7bb Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 28 八月 2023 16:02:15 +0800
Subject: [PATCH] 初步测试完成
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java | 1 -
src/main/java/com/gkhy/labRiskManage/application/experiment/service/impl/ExperimentAppServiceImpl.java | 14 ++++++++++++++
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportExperimentRiskSourceServiceImpl.java | 1 +
3 files changed, 15 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 7d5b191..df6ab53 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
@@ -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;
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportExperimentRiskSourceServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportExperimentRiskSourceServiceImpl.java
index 3483edc..4ae192f 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportExperimentRiskSourceServiceImpl.java
+++ b/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);
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java
index 7295182..90c5f95 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java
+++ b/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);
--
Gitblit v1.9.2