From c4354b452cb7b09fe28a9e8ea81f455df1c68de8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 05 八月 2022 17:02:59 +0800
Subject: [PATCH] 流程fix

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 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 4647ecd..cf32b34 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
@@ -6,11 +6,10 @@
 import com.gkhy.safePlatform.commons.enums.ResultCodes;
 import com.gkhy.safePlatform.commons.query.PageQuery;
 import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
-import com.gkhy.safePlatform.commons.utils.StringUtils;
 import com.gkhy.safePlatform.commons.vo.ResultVO;
 import com.gkhy.safePlatform.commons.vo.SearchResultVO;
 import com.gkhy.safePlatform.emergency.entity.*;
-import com.gkhy.safePlatform.emergency.enums.EmergencyPlanStatus;
+import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
 import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
 import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
 import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -18,10 +17,9 @@
 import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;
 import com.gkhy.safePlatform.emergency.query.db.EmergencyPlanDBQuery;
 import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
+import com.gkhy.safePlatform.emergency.service.EmergencyWorkApproveService;
 import com.gkhy.safePlatform.emergency.service.baseService.*;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.checkerframework.checker.guieffect.qual.UI;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +46,9 @@
     @Autowired
     private EmergencyPlanFileInfoService emergencyPlanFileInfoService;
 
+    @Autowired
+    private EmergencyWorkApproveInfoService emergencyWorkApproveInfoService;
+
     @DubboReference(check = false)
     private AccountDepartmentService accountDepartmentService;
 
@@ -66,9 +67,18 @@
 
         // 判断审批人
         for (EmergencyPlanPageRespDTO emergencyPlanPageRespDTO :respList){
-            // 审批中  判断审批人是否人与当前登录人
-            if (emergencyPlanPageRespDTO.getApproveStatus()!=null && emergencyPlanPageRespDTO.getApproveStatus()==2){
-                emergencyPlanPageRespDTO.setCheckApprove(emergencyPlanPageRespDTO.getApprovePersonId().equals(uid));
+
+            //获取对应的审批记录
+            Integer type = ApproveStatus.EMERGENCY.getStatus();
+            List<EmergencyWorkApproveInfoPageDO> emergencyWorkApproveInfoPageDOList = emergencyWorkApproveInfoService.selectWorkApproveByRelateTypeAndRelateId(type,emergencyPlanPageRespDTO.getId());
+
+            if (!CollectionUtils.isEmpty(emergencyWorkApproveInfoPageDOList)) {
+                emergencyPlanPageRespDTO.setApproveStatus(emergencyWorkApproveInfoPageDOList.get(0).getApproveStatus());
+                emergencyPlanPageRespDTO.setApprovePersonId(emergencyWorkApproveInfoPageDOList.get(0).getApprovePersonId());
+                // 审批中  判断审批人是否人与当前登录人
+                if (emergencyPlanPageRespDTO.getApproveStatus()!=null && emergencyPlanPageRespDTO.getApproveStatus()==2){
+                    emergencyPlanPageRespDTO.setCheckApprove(emergencyPlanPageRespDTO.getApprovePersonId().equals(uid));
+                }
             }
         }
 
@@ -91,7 +101,6 @@
         emergencyPlanInfo.setDelFlag(false);
         emergencyPlanInfo.setCreateUid(uid);
         emergencyPlanInfo.setGmtCreate(nowDate);
-        emergencyPlanInfo.setStatus(EmergencyPlanStatus.START.getStatus());
         emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo);
         // 新增应急预案区域表
         if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())) {

--
Gitblit v1.9.2