From 5dc0fc9e8cdef4d6c084e5a6e1827a17bb6fe526 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 04 Aug 2022 18:12:34 +0800
Subject: [PATCH] 审批流程
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 7a823cc..4647ecd 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
@@ -20,6 +20,8 @@
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
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;
@@ -50,7 +52,7 @@
private AccountDepartmentService accountDepartmentService;
@Override
- public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query) {
+ public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(Long uid , PageQuery<EmergencyPlanQuery> query) {
Long pageIndex = query.getPageIndex();
Long pageSize = query.getPageSize();
Page<EmergencyPlanInfoPageDO> page = new Page<>(pageIndex, pageSize);
@@ -61,6 +63,14 @@
}
List<EmergencyPlanInfoPageDO> emergencyPlanListDoInfoList = emergencyPlanInfoService.selectEmergencyPlanList(page, emergencyPlanDBQuery);
List<EmergencyPlanPageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyPlanListDoInfoList, EmergencyPlanPageRespDTO.class);
+
+ // 判断审批人
+ for (EmergencyPlanPageRespDTO emergencyPlanPageRespDTO :respList){
+ // 审批中 判断审批人是否人与当前登录人
+ if (emergencyPlanPageRespDTO.getApproveStatus()!=null && emergencyPlanPageRespDTO.getApproveStatus()==2){
+ emergencyPlanPageRespDTO.setCheckApprove(emergencyPlanPageRespDTO.getApprovePersonId().equals(uid));
+ }
+ }
return new SearchResultVO<>(
true,
@@ -417,6 +427,12 @@
}
}
+ @Override
+ public ResultVO updateAbolish(Long id, Boolean abolishStatus) {
+ emergencyPlanInfoService.updateAbolish(id,abolishStatus);
+ return new ResultVO(ResultCodes.OK);
+ }
+
private void deleteEmergencyPlan(Long id) {
//查询是否存在
EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(id);
--
Gitblit v1.9.2