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 | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 4d42004..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
@@ -19,17 +19,18 @@
import com.gkhy.labRiskManage.domain.account.model.dto.UserInfoDomainDTO;
import com.gkhy.labRiskManage.domain.account.service.UserDomainService;
import com.gkhy.labRiskManage.domain.basic.entity.BasicRiskUnitType;
-import com.gkhy.labRiskManage.domain.basic.model.dto.PersonQueryDTO;
import com.gkhy.labRiskManage.domain.basic.model.dto.SiteQueryDTO;
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentPersonService;
import com.gkhy.labRiskManage.domain.basic.service.BasicExperimentSiteService;
import com.gkhy.labRiskManage.domain.basic.service.BasicRiskUnitTypeService;
import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAndSite;
+import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentInfo;
import com.gkhy.labRiskManage.domain.experiment.enums.ExperimentApprovalStatusEnum;
import com.gkhy.labRiskManage.domain.experiment.enums.ExperimentRectifyStatusEnum;
import com.gkhy.labRiskManage.domain.experiment.model.dto.ExperimentInfoDTO;
import com.gkhy.labRiskManage.domain.experiment.service.ExperimentAndSiteService;
+import com.gkhy.labRiskManage.domain.experiment.service.ExperimentAssessLogService;
import com.gkhy.labRiskManage.domain.experiment.service.ExperimentInfoService;
import com.gkhy.labRiskManage.domain.riskReport.entity.*;
import com.gkhy.labRiskManage.domain.riskReport.model.bo.ReportQueryBO;
@@ -39,7 +40,6 @@
import com.gkhy.labRiskManage.domain.riskReport.service.*;
import com.gkhy.labRiskManage.domain.riskReport.utils.GetRoleTagUtils;
import com.gkhy.labRiskManage.domain.riskReport.utils.RiskSourceTypeUtils;
-import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -53,10 +53,8 @@
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
@@ -91,6 +89,8 @@
private ReportExperimentRiskSourceTypeService reportSourceTypeService;
@Autowired
private ReportExperimentRiskSourceService reportSourceService;
+ @Autowired
+ private ExperimentAssessLogService experimentAssessLogService;
@Autowired
private UserDomainService userDomainService;
@@ -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);
@@ -820,6 +819,19 @@
if (ObjectUtils.isEmpty(experimentInfo)){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"实验信息状态修改失败");
}
+
+ //添加评估记录 todo
+ ExperimentAssessLog experimentAssessLog = new ExperimentAssessLog();
+ experimentAssessLog.setExperimentCode(experimentInfo.getExperimentCode());
+ experimentAssessLog.setAssessEndTime(date);
+ experimentAssessLog.setAssessUser(user.getRealName());
+ experimentAssessLog.setAssessResult(StatusEnum.APPROVED_PASS.getCode().byteValue());
+ ExperimentAssessLog experimentAssessLogResult = experimentAssessLogService.saveExperimentAssessLog(experimentAssessLog);
+ if (ObjectUtils.isEmpty(experimentAssessLogResult)){
+ throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"实验信息评估记录写入失败");
+ }
+ }else {
+ throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"无操作权限");
}
}
@@ -843,6 +855,8 @@
if (ObjectUtils.isEmpty(assessPerson)){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"审核信息保存失败");
}
+ }else {
+ throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"无操作权限");
}
//修改报告状态
reportById.setApprovePlanStatus(StatusEnum.REPORT_NOT_APPROVED.getCode().byteValue());
@@ -860,6 +874,18 @@
if (ObjectUtils.isEmpty(experimentInfo)){
throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"实验信息状态修改失败");
}
+
+
+ //添加评估记录 todo
+ ExperimentAssessLog experimentAssessLog = new ExperimentAssessLog();
+ experimentAssessLog.setExperimentCode(experimentInfo.getExperimentCode());
+ experimentAssessLog.setAssessEndTime(date);
+ experimentAssessLog.setAssessUser(user.getRealName());
+ experimentAssessLog.setAssessResult(StatusEnum.APPROVED_NOT_PASS.getCode().byteValue());
+ ExperimentAssessLog experimentAssessLogResult = experimentAssessLogService.saveExperimentAssessLog(experimentAssessLog);
+ if (ObjectUtils.isEmpty(experimentAssessLogResult)){
+ throw new BusinessException(this.getClass(), ResultCode.BUSINESS_ERROR_NOT_ALLOWED.getCode() ,"实验信息评估记录写入失败");
+ }
}
return StatusEnum.SUCCESS.getCode();
--
Gitblit v1.9.2