From 7a9a4f4764b0a402e3d0b4a1dafc7ecf96cb1583 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 28 八月 2023 09:22:54 +0800
Subject: [PATCH] 多少评定预留开始时间
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java | 8 ++++----
src/main/java/com/gkhy/labRiskManage/domain/experiment/entity/ExperimentAssessLog.java | 7 ++++++-
src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java | 3 +++
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/experiment/entity/ExperimentAssessLog.java b/src/main/java/com/gkhy/labRiskManage/domain/experiment/entity/ExperimentAssessLog.java
index 0e00ba6..145a45a 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/experiment/entity/ExperimentAssessLog.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/experiment/entity/ExperimentAssessLog.java
@@ -30,7 +30,12 @@
* 评价时间
*/
@JsonFormat
- private LocalDateTime assessTime;
+ private LocalDateTime assessStartTime;
+ /**
+ * 评价时间
+ */
+ @JsonFormat
+ private LocalDateTime assessEndTime;
/**
* 评估结果：2-通过；3-不通过
*/
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java
index 7c85f45..f3b5b59 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentInfoServiceImpl.java
@@ -455,6 +455,9 @@
if(!CollectionUtils.isEmpty(experimentInfos)){
flag = true;
}
+
+
+
return flag;
}
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 2c2aa9e..7295182 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
@@ -821,10 +821,10 @@
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"实验信息状态修改失败");
}
- //添加评估记录
+ //添加评估记录 todo
ExperimentAssessLog experimentAssessLog = new ExperimentAssessLog();
experimentAssessLog.setExperimentCode(experimentInfo.getExperimentCode());
- experimentAssessLog.setAssessTime(date);
+ experimentAssessLog.setAssessEndTime(date);
experimentAssessLog.setAssessUser(user.getRealName());
experimentAssessLog.setAssessResult(StatusEnum.APPROVED_PASS.getCode().byteValue());
ExperimentAssessLog experimentAssessLogResult = experimentAssessLogService.saveExperimentAssessLog(experimentAssessLog);
@@ -877,10 +877,10 @@
}
- //添加评估记录
+ //添加评估记录 todo
ExperimentAssessLog experimentAssessLog = new ExperimentAssessLog();
experimentAssessLog.setExperimentCode(experimentInfo.getExperimentCode());
- experimentAssessLog.setAssessTime(date);
+ experimentAssessLog.setAssessEndTime(date);
experimentAssessLog.setAssessUser(user.getRealName());
experimentAssessLog.setAssessResult(StatusEnum.APPROVED_NOT_PASS.getCode().byteValue());
ExperimentAssessLog experimentAssessLogResult = experimentAssessLogService.saveExperimentAssessLog(experimentAssessLog);
--
Gitblit v1.9.2