From 964dd88319269c16d4ebb99007a954b51e625ef2 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 14 五月 2024 09:41:49 +0800
Subject: [PATCH] 旧数据增删改查，导入导出功能初步完成
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
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..235f60e 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
@@ -122,7 +122,7 @@
if (ObjectUtils.isEmpty(queryBO.getTag())){
throw new BusinessException(this.getClass(), ResultCode.PARAM_ERROR.getCode() ,"查询报告类别参数缺失");
}
- if (queryBO.getExperimentName() == "null"){
+ if (queryBO.getExperimentName() == ""){
queryBO.setExperimentName(null);
}
UserInfoDomainDTO user = userDomainService.getUserById(currentUserId);
@@ -157,7 +157,7 @@
predicateList.add(criteriaBuilder.equal(root.get("experimentId"),queryParam.getExperimentId()));
}
if (!ObjectUtils.isEmpty(queryParam.getExperimentName())){
- predicateList.add(criteriaBuilder.equal(root.get("experimentName"), queryParam.getExperimentName()));
+ predicateList.add(criteriaBuilder.like(root.get("experimentName"),"%"+queryParam.getExperimentName()+"%"));
}
if (roleTag == UserTagEnum.USER_TAG_0.getCode()){
predicateList.add(criteriaBuilder.equal(root.get("personUserId"), currentUserId));
@@ -165,7 +165,8 @@
if (queryParam.getTag() == 1){
predicateList.add(criteriaBuilder.isNull(root.get("assessPerson")));
}else if (queryParam.getTag() == 2){
- predicateList.add(criteriaBuilder.isNotNull(root.get("assessPerson")));
+ predicateList.add(criteriaBuilder.isNotNull(root.get("assessPerson"))
+ );
}
//现在领导能查看所有的报告
// if (roleTag == UserTagEnum.USER_TAG_2.getCode()){
@@ -555,7 +556,6 @@
reportById.setAssessPerson(reportUpdateBO.getAssessPerson());
reportById.setAssessLevel(reportUpdateBO.getAssessLevel());
-// reportById.setSafeRiskAnalysis(reportUpdateBO.getSafeRiskAnalysis());
reportById.setDescription(reportUpdateBO.getDescription());
reportById.setUpdateTime(LocalDateTime.now());
reportById.setUpdateByUserId(currentUserId);
@@ -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