From 23a8a9eea8445e1a13fbb3ab7bbca36e387f15a8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Tue, 31 Oct 2023 15:26:50 +0800
Subject: [PATCH] 实验报告模糊查询，实验名接受空字符串
---
src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..185f7fe 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));
@@ -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);
@@ -821,10 +820,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 +876,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