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/entity/EmergencyPlanInfoPageDO.java | 22 ---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java | 20 ++
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml | 28 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java | 52 +++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java | 20 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java | 3
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java | 14 +-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java | 7 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java | 5
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java | 24 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java | 52 +++++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java | 95 +++++++++++--
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 25 ++-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java | 5
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java | 6
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java | 1
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java | 20 ++
18 files changed, 336 insertions(+), 67 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
index 71c5c32..82367c4 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
@@ -23,7 +23,7 @@
private EmergencyWorkApproveService workApproveService;
/**
- * 应急预案列表
+ * 应急审批列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
private ResultVO<List<EmergencyWorkApprovePageRespDTO>> list (@RequestBody PageQuery<EmergencyWorkApproveQuery> pageQuery){
@@ -32,16 +32,16 @@
}
/**
- * 应急预案新增
+ * 应急审批新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
public ResultVO addWorkApprove(Authentication authentication, @RequestBody EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return workApproveService.addWorkApprove(currentUser.getUid(), EmergencyWorkApproveReqDTO);
+ return workApproveService.addWorkApprove(currentUser, EmergencyWorkApproveReqDTO);
}
/**
- * 应急预案详情
+ * 应急审批详情
*/
@RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){
@@ -49,16 +49,16 @@
}
/**
- * 应急预案修改
+ * 应急审批修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
public ResultVO updateWorkApprove(Authentication authentication, @RequestBody EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return workApproveService.updateWorkApprove(currentUser.getUid(), EmergencyWorkApproveReqDTO);
+ return workApproveService.updateWorkApprove(currentUser, EmergencyWorkApproveReqDTO);
}
/**
- * 应急预案删除/批量删除
+ * 应急审批删除/批量删除
*/
@RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
public ResultVO batchDeleteWorkApprove(@PathVariable("ids")String ids){
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
index 44487ca..0c7e9c2 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
@@ -8,28 +8,6 @@
@TableName("emergency_plan")
public class EmergencyPlanInfoPageDO {
- // 审批状态
- private Integer approveStatus;
-
- // 审批人
- private Long approvePersonId;
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-
- public Long getApprovePersonId() {
- return approvePersonId;
- }
-
- public void setApprovePersonId(Long approvePersonId) {
- this.approvePersonId = approvePersonId;
- }
-
private String authorName;
public String getAuthorName() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
index a89b2d9..29d15ac 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
@@ -28,21 +28,41 @@
private String title;
//提交人ID/外键
private Long submitPersonId;
+ //提交人名称/外键
+ private String submitPersonName;
//审批人ID/外键
private Long approvePersonId;
+ //审批人名称/外键
+ private String approvePersonName;
//审批状态 1：未审批 2：审批中 3：审批完成
private Integer approveStatus;
//审批意见
private Boolean approveResult;
- //审批意见
+ //审批意见备注
private String approveMemo;
- //关联业务类型 1:目标检查 2:目标上报
+ //关联业务类型 1:应急预案
private Integer relateType;
//关联的审批对象表ID
private Long relateId;
//关联业务说明
private String relateDesc;
+ public String getSubmitPersonName() {
+ return submitPersonName;
+ }
+
+ public void setSubmitPersonName(String submitPersonName) {
+ this.submitPersonName = submitPersonName;
+ }
+
+ public String getApprovePersonName() {
+ return approvePersonName;
+ }
+
+ public void setApprovePersonName(String approvePersonName) {
+ this.approvePersonName = approvePersonName;
+ }
+
public Long getId() {
return id;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
index 95befbd..273f74c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
@@ -20,9 +20,61 @@
private String title;
//提交人ID/外键
private Long submitPersonId;
+ //提交人名称/外键
+ private String submitPersonName;
+ //审批人ID/外键
+ private Long approvePersonId;
+ //审批人名称/外键
+ private String approvePersonName;
//审批状态 1：未审批 2：审批中 3：审批完成
private Integer approveStatus;
+ //审批意见
+ private Boolean approveResult;
+ //审批意见备注
+ private String approveMemo;
+
+
+ public Boolean getApproveResult() {
+ return approveResult;
+ }
+
+ public void setApproveResult(Boolean approveResult) {
+ this.approveResult = approveResult;
+ }
+
+ public String getApproveMemo() {
+ return approveMemo;
+ }
+
+ public void setApproveMemo(String approveMemo) {
+ this.approveMemo = approveMemo;
+ }
+
+ public String getSubmitPersonName() {
+ return submitPersonName;
+ }
+
+ public void setSubmitPersonName(String submitPersonName) {
+ this.submitPersonName = submitPersonName;
+ }
+
+ public Long getApprovePersonId() {
+ return approvePersonId;
+ }
+
+ public void setApprovePersonId(Long approvePersonId) {
+ this.approvePersonId = approvePersonId;
+ }
+
+ public String getApprovePersonName() {
+ return approvePersonName;
+ }
+
+ public void setApprovePersonName(String approvePersonName) {
+ this.approvePersonName = approvePersonName;
+ }
+
public Long getId() {
return id;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java
index e6fab64..74231c0 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/ApproveStatus.java
@@ -2,9 +2,8 @@
public enum ApproveStatus {
- NOT_APPROVE(1),
- UNDER_APPROVE(2),
- COMPLETED_APPROVE(3);
+ // 应急物资
+ EMERGENCY(1);
private Integer status;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
index efd2761..5b5289e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/enums/EmergencyResultCodes.java
@@ -60,6 +60,13 @@
SUPPLIES_MAINTAIN_NOT_EXIST("S1006" , "应急物资保养不存在"),
+ APPROVE_RELATE_ID_NULL("A1001","审批业务类型不可为空"),
+
+ APPROVE_RELATE_TYPE_NULL("A1002","审批业务对象不可为空"),
+
+ APPROVE_PERSON_NULL("A1003","审批人不可为空"),
+
+ APPROVE_STATUS_NULL("A1004","审批状态不可为空"),
ERROR("A3000", "未知错误");
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
index 6428061..5e8b639 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
@@ -10,8 +10,12 @@
private String title;
//提交人ID/外键
private Long submitPersonId;
+ //提交人名称/外键
+ private String submitPersonName;
//审批人ID/外键
private Long approvePersonId;
+ //审批人名称/外键
+ private String approvePersonName;
//审批状态 1：未审批 2：审批中 3：审批完成
private Integer approveStatus;
//审批意见
@@ -25,6 +29,22 @@
//关联业务说明
private String relateDesc;
+ public String getSubmitPersonName() {
+ return submitPersonName;
+ }
+
+ public void setSubmitPersonName(String submitPersonName) {
+ this.submitPersonName = submitPersonName;
+ }
+
+ public String getApprovePersonName() {
+ return approvePersonName;
+ }
+
+ public void setApprovePersonName(String approvePersonName) {
+ this.approvePersonName = approvePersonName;
+ }
+
public Long getId() {
return id;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
index 13db6b4..88df0b6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
@@ -7,7 +7,6 @@
public class EmergencyWorkApprovePageRespDTO {
private Long id;
-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtCreate;
@@ -17,9 +16,60 @@
private String title;
//提交人ID/外键
private Long submitPersonId;
+ //提交人名称/外键
+ private String submitPersonName;
+ //审批人ID/外键
+ private Long approvePersonId;
+ //审批人名称/外键
+ private String approvePersonName;
//审批状态 1：未审批 2：审批中 3：审批完成
private Integer approveStatus;
+ //审批意见
+ private Boolean approveResult;
+ //审批意见备注
+ private String approveMemo;
+
+ public String getSubmitPersonName() {
+ return submitPersonName;
+ }
+
+ public void setSubmitPersonName(String submitPersonName) {
+ this.submitPersonName = submitPersonName;
+ }
+
+ public Long getApprovePersonId() {
+ return approvePersonId;
+ }
+
+ public void setApprovePersonId(Long approvePersonId) {
+ this.approvePersonId = approvePersonId;
+ }
+
+ public String getApprovePersonName() {
+ return approvePersonName;
+ }
+
+ public void setApprovePersonName(String approvePersonName) {
+ this.approvePersonName = approvePersonName;
+ }
+
+ public Boolean getApproveResult() {
+ return approveResult;
+ }
+
+ public void setApproveResult(Boolean approveResult) {
+ this.approveResult = approveResult;
+ }
+
+ public String getApproveMemo() {
+ return approveMemo;
+ }
+
+ public void setApproveMemo(String approveMemo) {
+ this.approveMemo = approveMemo;
+ }
+
public Long getId() {
return id;
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
index 0177545..2c5c53b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
@@ -6,6 +6,26 @@
public class EmergencyWorkApproveQuery {
+ private Integer relateType;
+
+ private Long relateId;
+
+ public Integer getRelateType() {
+ return relateType;
+ }
+
+ public void setRelateType(Integer relateType) {
+ this.relateType = relateType;
+ }
+
+ public Long getRelateId() {
+ return relateId;
+ }
+
+ public void setRelateId(Long relateId) {
+ this.relateId = relateId;
+ }
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
index 7da355c..bd5b684 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
@@ -6,6 +6,26 @@
public class EmergencyWorkApproveDBQuery {
+ private Integer relateType;
+
+ private Long relateId;
+
+ public Integer getRelateType() {
+ return relateType;
+ }
+
+ public void setRelateType(Integer relateType) {
+ this.relateType = relateType;
+ }
+
+ public Long getRelateId() {
+ return relateId;
+ }
+
+ public void setRelateId(Long relateId) {
+ this.relateId = relateId;
+ }
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date startTime;
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java
index 3c80c25..6e7bd4a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java
@@ -24,4 +24,5 @@
void deleteWorkApproveById(@Param("id") Long id);
+ void selectWorkApproveByRelateTypeAndRelateId(@Param("type")Integer type, @Param("id")Long id);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java
index 1544ae7..ab654de 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.emergency.service;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
@@ -14,11 +15,11 @@
SearchResultVO<List<EmergencyWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<EmergencyWorkApproveQuery> query);
- ResultVO addWorkApprove(Long valueOf, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO);
+ ResultVO addWorkApprove(ContextCacheUser currentUser, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO);
ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id);
- ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO);
+ ResultVO updateWorkApprove(ContextCacheUser currentUser, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO);
ResultVO batchDeleteWorkApprove(String ids);
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
index 680e29c..8bd7d12 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
@@ -5,6 +5,8 @@
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO;
+import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;
import java.util.List;
@@ -21,4 +23,6 @@
void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo);
void deleteWorkApproveById(Long teamId);
+
+ List<EmergencyWorkApproveInfoPageDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java
index 3dec678..2d2029e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyWorkApproveServiceImpl.java
@@ -44,5 +44,11 @@
emergencyWorkApproveInfoRepository.deleteWorkApproveById(teamId);
}
+ @Override
+ public List<EmergencyWorkApproveInfoPageDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id) {
+ emergencyWorkApproveInfoRepository.selectWorkApproveByRelateTypeAndRelateId(type,id);
+ return null;
+ }
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
index 8692b48..14b3936 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
@@ -4,11 +4,9 @@
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.EmergencyDrillPlanStatus;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -84,7 +82,6 @@
emergencyDrillPlanInfo.setDelFlag(false);
emergencyDrillPlanInfo.setCreateUid(uid);
emergencyDrillPlanInfo.setGmtCreate(nowDate);
- emergencyDrillPlanInfo.setStatus(EmergencyDrillPlanStatus.START.getStatus());
emergencyDrillPlanInfoService.addEmergencyDrillPlan(emergencyDrillPlanInfo);
// 新增急演练计划附件表
if (!CollectionUtils.isEmpty(emergencyDrillPlanReqDTO.getFileList())) {
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())) {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
index b6f3338..4e55c4a 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyWorkApproveServiceImpl.java
@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -8,7 +9,6 @@
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.ApproveStatus;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyWorkApproveReqDTO;
@@ -56,19 +56,95 @@
}
@Override
- public ResultVO addWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
+ public ResultVO addWorkApprove(ContextCacheUser currentUser, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
+
+ // 业务类型
+ if (EmergencyWorkApproveReqDTO.getRelateType()==null){
+ throw new EmergencyException(EmergencyResultCodes.APPROVE_RELATE_ID_NULL);
+ }
+ // 业务主表id
+ if (EmergencyWorkApproveReqDTO.getRelateId()==null){
+ throw new EmergencyException(EmergencyResultCodes.APPROVE_RELATE_TYPE_NULL);
+ }
+ // 审批人
+ if (EmergencyWorkApproveReqDTO.getApprovePersonId()==null){
+ throw new EmergencyException(EmergencyResultCodes.APPROVE_PERSON_NULL);
+ }
+ // 审批状态
+ if (EmergencyWorkApproveReqDTO.getApproveStatus()==null){
+ throw new EmergencyException(EmergencyResultCodes.APPROVE_STATUS_NULL);
+ }
+
Date nowDate = new Date();
- //1.新增应急队伍
+ Long uid = currentUser.getUid();
+ String uName = currentUser.getRealName();
+ //1.新增应急审批
EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo);
EmergencyWorkApproveInfo.setDelFlag(false);
EmergencyWorkApproveInfo.setCreateUid(uid);
EmergencyWorkApproveInfo.setGmtCreate(nowDate);
- EmergencyWorkApproveInfo.setApproveStatus(ApproveStatus.NOT_APPROVE.getStatus());
+ EmergencyWorkApproveInfo.setSubmitPersonId(uid);
+ EmergencyWorkApproveInfo.setSubmitPersonName(uName);
workApproveInfoService.addWorkApprove(EmergencyWorkApproveInfo);
return new ResultVO(ResultCodes.OK);
}
+
+ @Override
+ public ResultVO updateWorkApprove(ContextCacheUser currentUser, EmergencyWorkApproveReqDTO emergencyWorkApproveReqDTO) {
+
+ Date nowDate = new Date();
+ Long uid = currentUser.getUid();
+ String uName = currentUser.getRealName();
+ // 更新原审批记录
+ EmergencyWorkApproveInfo emergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
+ emergencyWorkApproveInfo.setId(emergencyWorkApproveReqDTO.getId());
+ emergencyWorkApproveInfo.setUpdateUid(uid);
+ emergencyWorkApproveInfo.setGmtModitify(nowDate);
+ emergencyWorkApproveInfo.setApproveStatus(emergencyWorkApproveReqDTO.getApproveStatus());
+ emergencyWorkApproveInfo.setApproveResult(emergencyWorkApproveReqDTO.getApproveResult());
+ emergencyWorkApproveInfo.setApproveMemo(emergencyWorkApproveReqDTO.getApproveMemo());
+ workApproveInfoService.updateWorkApprove(emergencyWorkApproveInfo);
+
+ //新增下级审批记录
+ if (emergencyWorkApproveReqDTO.getApproveStatus() == 2){
+ EmergencyWorkApproveInfo newEmergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
+ BeanUtils.copyProperties(emergencyWorkApproveReqDTO,newEmergencyWorkApproveInfo);
+
+ newEmergencyWorkApproveInfo.setId(null);
+ newEmergencyWorkApproveInfo.setDelFlag(false);
+ newEmergencyWorkApproveInfo.setCreateUid(uid);
+ newEmergencyWorkApproveInfo.setGmtCreate(nowDate);
+ newEmergencyWorkApproveInfo.setSubmitPersonId(uid);
+ newEmergencyWorkApproveInfo.setSubmitPersonName(uName);
+ newEmergencyWorkApproveInfo.setApproveResult(null);
+ newEmergencyWorkApproveInfo.setApproveMemo(null);
+ workApproveInfoService.addWorkApprove(newEmergencyWorkApproveInfo);
+ }
+ return new ResultVO(ResultCodes.OK);
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@Override
public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id) {
@@ -78,17 +154,6 @@
BeanUtils.copyProperties(EmergencyWorkApproveInfoDetailDO, emergencyWorkApproveDetailRespDTO);
return new ResultVO<>(ResultCodes.OK, emergencyWorkApproveDetailRespDTO);
- }
-
- @Override
- public ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) {
- Date nowDate = new Date();
- EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo();
- BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo);
- EmergencyWorkApproveInfo.setUpdateUid(uid);
- EmergencyWorkApproveInfo.setGmtModitify(nowDate);
- workApproveInfoService.updateWorkApprove(EmergencyWorkApproveInfo);
- return new ResultVO(ResultCodes.OK);
}
@Override
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
index 304cce4..d82e9d9 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
@@ -6,18 +6,25 @@
<resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO" id="emergencyWorkApproveInfoPageDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="gmt_create" property="gmtCreate"/>
<result column="work_name" property="workName"/>
<result column="title" property="title"/>
<result column="submit_person_id" property="submitPersonId"/>
+ <result column="submit_person_name" property="submitPersonName"/>
+ <result column="approve_person_id" property="approvePersonId"/>
+ <result column="approve_person_name" property="approvePersonName"/>
<result column="approve_status" property="approveStatus"/>
+ <result column="approve_result" property="approveResult"/>
+ <result column="approve_memo" property="approveMemo"/>
</resultMap>
<select id="selectWorkApproveList" resultMap="emergencyWorkApproveInfoPageDOResult">
- select id,`work_name`,`title`,`submit_person_id`,`approve_status`,gmt_create from emergency_work_approve where del_flag = 0
+ select id,`work_name`,`title`,`submit_person_id`,submit_person_name,approve_person_id,approve_person_name,
+ `approve_status`,approve_result ,approve_memo ,gmt_create from emergency_work_approve
+ where del_flag = 0 and relate_type = #{query.relateType} and relate_id = #{query.relateId}
<if test="query.startTime != null "> and gmt_create <![CDATA[ >= ]]> #{query.startTime}</if>
<if test="query.endTime != null "> and gmt_create <![CDATA[ <= ]]> #{query.endTime}</if>
+ order by gmt_create desc
</select>
<insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo"
@@ -34,7 +41,9 @@
<if test="workName != null and workName != ''">work_name,</if>
<if test="title != null and title != ''">title,</if>
<if test="submitPersonId != null ">submit_person_id,</if>
+ <if test="submitPersonName != null and submitPersonName != ''">submit_person_name,</if>
<if test="approvePersonId != null ">approve_person_id,</if>
+ <if test="approvePersonName != null and approvePersonName != ''">approve_person_name,</if>
<if test="approveStatus != null ">approve_status,</if>
<if test="approveResult != null ">approve_result,</if>
<if test="approveMemo != null and approveMemo != ''">approve_memo,</if>
@@ -52,8 +61,10 @@
<if test="workName != null and workName != ''">#{workName},</if>
<if test="title != null and title != ''">#{title},</if>
- <if test="submitPersonId != null ">#{submitPersonId},</if>
- <if test="approvePersonId != null ">#{approvePersonId},</if>
+ <if test="submitPersonId != null "> #{submitPersonId},</if>
+ <if test="submitPersonName != null and submitPersonName != ''"> #{submitPersonName},</if>
+ <if test="approvePersonId != null "> #{approvePersonId},</if>
+ <if test="approvePersonName != null and approvePersonName != ''"> #{approvePersonName},</if>
<if test="approveStatus != null ">#{approveStatus},</if>
<if test="approveResult != null ">#{approveResult},</if>
<if test="approveMemo != null and approveMemo != ''">#{approveMemo},</if>
@@ -84,6 +95,13 @@
from emergency_work_approve where del_flag = 0 and id = #{id}
</select>
+ <select id="selectWorkApproveByRelateTypeAndRelateId" resultMap="WorkApproveInfoDetailDOResult">
+ select id,`work_name`,`title`,`submit_person_id`,submit_person_name,approve_person_id,approve_person_name,
+ `approve_status`,approve_result ,approve_memo ,gmt_create from emergency_work_approve
+ where del_flag = 0 and relate_type = #{type} and relate_id = #{id}
+ order by gmt_create desc
+ </select>
+
<update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo">
update emergency_work_approve
<trim prefix="SET" suffixOverrides=",">
@@ -93,7 +111,9 @@
<if test="workName != null and workName != ''">work_name = #{workName},</if>
<if test="title != null and title != ''">title = #{title},</if>
<if test="submitPersonId != null ">submit_person_id = #{submitPersonId},</if>
+ <if test="submitPersonName != null and submitPersonName != ''">submit_person_name = #{submitPersonName},</if>
<if test="approvePersonId != null ">approve_person_id = #{approvePersonId},</if>
+ <if test="approvePersonName != null and approvePersonName != ''">approve_person_name = #{approvePersonName},</if>
<if test="approveStatus != null ">approve_status = #{approveStatus},</if>
<if test="approveResult != null ">approve_result = #{approveResult},</if>
<if test="approveMemo != null and approveMemo != ''">approve_memo = #{approveMemo},</if>
--
Gitblit v1.9.2