From 37f303aa95b9f6e09db8db216dbe39834ef4ca98 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 13:58:58 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
index cf32b34..9148846 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -70,11 +70,12 @@
//获取对应的审批记录
Integer type = ApproveStatus.EMERGENCY.getStatus();
- List<EmergencyWorkApproveInfoPageDO> emergencyWorkApproveInfoPageDOList = emergencyWorkApproveInfoService.selectWorkApproveByRelateTypeAndRelateId(type,emergencyPlanPageRespDTO.getId());
+ List<EmergencyWorkApproveInfoDetailDO> emergencyWorkApproveInfoDetailDOList = emergencyWorkApproveInfoService.selectWorkApproveByRelateTypeAndRelateId(type,emergencyPlanPageRespDTO.getId());
- if (!CollectionUtils.isEmpty(emergencyWorkApproveInfoPageDOList)) {
- emergencyPlanPageRespDTO.setApproveStatus(emergencyWorkApproveInfoPageDOList.get(0).getApproveStatus());
- emergencyPlanPageRespDTO.setApprovePersonId(emergencyWorkApproveInfoPageDOList.get(0).getApprovePersonId());
+ if (!CollectionUtils.isEmpty(emergencyWorkApproveInfoDetailDOList)) {
+ emergencyPlanPageRespDTO.setApproveId(emergencyWorkApproveInfoDetailDOList.get(0).getId());
+ emergencyPlanPageRespDTO.setApproveStatus(emergencyWorkApproveInfoDetailDOList.get(0).getApproveStatus());
+ emergencyPlanPageRespDTO.setApprovePersonId(emergencyWorkApproveInfoDetailDOList.get(0).getApprovePersonId());
// 审批中 判断审批人是否人与当前登录人
if (emergencyPlanPageRespDTO.getApproveStatus()!=null && emergencyPlanPageRespDTO.getApproveStatus()==2){
emergencyPlanPageRespDTO.setCheckApprove(emergencyPlanPageRespDTO.getApprovePersonId().equals(uid));
@@ -101,6 +102,7 @@
emergencyPlanInfo.setDelFlag(false);
emergencyPlanInfo.setCreateUid(uid);
emergencyPlanInfo.setGmtCreate(nowDate);
+ emergencyPlanInfo.setAbolishStatus(false);
emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo);
// 新增应急预案区域表
if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())) {
--
Gitblit v1.9.2