[修改]流程审批处理

common/src/main/java/com/keymobile/governworkorder/common/bo/WorkOrderInfoVO.java

@@ -44,7 +44,7 @@ public class WorkOrderInfoVO {
     /**
      * 流程环节 发起、处理、审批
      */
-    @Schema(description = "流程环节 发起、处理、审批")
+    @Schema(description = "流程环节 发起、处理、审批、关闭、失效")
     private String stage;
     /**
      * 工单创建时间

common/src/main/java/com/keymobile/governworkorder/common/type/OrderProcessStageTypeEnum.java

@@ -10,7 +10,9 @@ public enum OrderProcessStageTypeEnum {
 
     PROCESS_CREATE("发起"),
     PROCESS_HANDLER("处理"),
-    PROCESS_APPROVER("审批");
+    PROCESS_APPROVER("审批"),
+    PROCESS_DONE("关闭"),
+    PROCESS_INVALIDATE("失效");
 
     public String getName() {
         return name;

common/src/main/java/com/keymobile/governworkorder/common/type/OrderTypeEnum.java

@@ -2,10 +2,10 @@ package com.keymobile.governworkorder.common.type;
 
 public enum OrderTypeEnum {
 
-    DATA_UPDATE("资产变更"),
+    DATA_UPDATE("资产完善"),
     DATA_ADD("资产新增"),
     DATA_OFF("资产下架"),
-    DATA_TRANSFER("资产下架");
+    DATA_TRANSFER("资产转移");
 
     public String getName() {
         return name;

core/src/main/java/com/keymobile/governworkorder/core/api/WorkOrderApi.java

@@ -68,7 +68,7 @@ public class WorkOrderApi {
     @RequestMapping(value = "/confirmData", method = {RequestMethod.POST})
     @Operation(summary = "确认数据", description = "")
     public void confirmData(@RequestParam String workOrderId,
-                            @RequestParam List<WorkOrderConfirmDataDto> confirmDataList) {
+                            @RequestBody List<WorkOrderConfirmDataDto> confirmDataList) {
         workOrderService.confirmData(workOrderId, confirmDataList);
     }
 

core/src/main/java/com/keymobile/governworkorder/core/persistence/model/WorkOrderInfo.java

@@ -40,7 +40,7 @@ public class WorkOrderInfo {
      */
     private String status;
     /**
-     * 流程环节 发起、处理、审批
+     * 流程环节 发起、处理、审批、关闭、失效
      */
     private String stage;
     /**

core/src/main/java/com/keymobile/governworkorder/core/service/impl/WorkOrderServiceImpl.java

@@ -211,7 +211,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         WorkOrderInfo workOrder = mongoTemplate.findById(workOrderId, WorkOrderInfo.class);
         Assert.notNull(workOrder, "找不到对应工单");
         if (!StringUtils.equals(OrderProcessStageTypeEnum.PROCESS_APPROVER.getName(), workOrder.getStage())
-                || contains(workOrder.getNextUserName(), LogManager.getUserName())) {
+                || !contains(workOrder.getNextUserName(), LogManager.getUserName())) {
             throw new RuntimeException("非审批人无法确认工单");
         }
         for (WorkOrderConfirmDataDto item : confirmDataList) {
@@ -336,7 +336,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         mongoTemplate.save(process);
 
         workOrder.setStatus(OrderStatusTypeEnum.STATUS_PROCESSING.getName());
-        workOrder.setStage(OrderProcessStageTypeEnum.PROCESS_CREATE.getName());
+        workOrder.setStage(OrderProcessStageTypeEnum.PROCESS_HANDLER.getName());
         workOrder.setUpdateTime(DateUtil.getDateTime());
         workOrder.setNextUserName(workOrder.getHandleUserName());
         workOrder.setNextUserDname(workOrder.getHandleUserDname());
@@ -363,7 +363,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
 
         //处理人无法驳回
         if (StringUtils.equals(OrderProcessStageTypeEnum.PROCESS_HANDLER.getName(), workOrder.getStage())
-                && StringUtils.equals(OrderApprovalTypeEnum.APPROVAL_PASS.getName(), processVO.getType())) {
+                && StringUtils.equals(OrderApprovalTypeEnum.APPROVAL_REJECT.getName(), processVO.getType())) {
             throw new RuntimeException("处理人无法驳回");
         }
 
@@ -377,7 +377,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
 
         //驳回
         if (StringUtils.equals(OrderApprovalTypeEnum.APPROVAL_REJECT.getName(), processVO.getType())) {
-            //资产变更工单审批人驳回返回处理人处理，否则工单失效
+            //资产完善工单审批人驳回返回处理人处理，否则工单失效
             if (StringUtils.equals(OrderTypeEnum.DATA_UPDATE.getName(), workOrder.getType())) {
                 process.setNextUserName(workOrder.getHandleUserName());
                 process.setNextUserDname(workOrder.getHandleUserDname());
@@ -391,7 +391,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
                 process.setNextUserDname(null);
                 workOrder.setNextUserName(null);
                 workOrder.setNextUserDname(null);
-                workOrder.setStage(null);
+                workOrder.setStage(OrderProcessStageTypeEnum.PROCESS_INVALIDATE.getName());
                 workOrder.setStatus(OrderStatusTypeEnum.STATUS_INVALIDATE.getName());
                 mongoTemplate.save(process);
                 mongoTemplate.save(workOrder);
@@ -408,7 +408,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
                 process.setNextUserDname(null);
                 workOrder.setNextUserName(null);
                 workOrder.setNextUserDname(null);
-                workOrder.setStage(null);
+                workOrder.setStage(OrderProcessStageTypeEnum.PROCESS_DONE.getName());
                 workOrder.setStatus(OrderStatusTypeEnum.STATUS_DONE.getName());
                 mongoTemplate.save(process);
                 mongoTemplate.save(workOrder);