优化

platform-dao/src/main/java/com/platform/dao/enums/PreparationNodeEnum.java

@@ -0,0 +1,41 @@
+package com.platform.dao.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 报修单状态枚举
+ * @Author liuyu
+ * @Date 2020/05/05
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
+ */
+@Getter
+@AllArgsConstructor
+public enum PreparationNodeEnum {
+    /**
+     * 申请
+     */
+    APPLY(1),
+    /**
+     * 主管审核通过
+     */
+    APPLY_MANAGER_VERIFY(2),
+    /**
+     * 申请部门负责人审核通过
+     */
+    APPLY_LEADER_VERIFY(3),
+    /**
+     * 执行主管审核通过
+     */
+    EXECUTE_LEADER_VERIFY(4),
+    /**
+     * 费用审核通过
+     */
+    EXECUTING(5),
+    /**
+     * 已完成
+     */
+    FINISHED(6),
+    ;
+    private final Integer value;
+}

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -279,6 +279,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         Integer count = mapper.selectCountByExample(weekend);
         model.setNo(IdGeneratorUtils.getPreparationNo(++count));
         model.setStatus(PreparationStatusEnum.NOT_ALLOCATED.getValue()); // 待主管审核
+        model.setNodeNum(PreparationNodeEnum.APPLY.getValue());
         Preparation preparation = this.saveModelByDTO(model);
         // 给申请部门主管发送信息，通知审核
         SysUser sendUser = sysUserMapper.selectByPrimaryKey(model.getApplyVerifyUserId());
@@ -327,6 +328,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
             if (StringUtils.isEmpty(model.getRepairUserId())) {
                 throw new DeniedException("执行人不能为空");
             }
+            updPre.setNodeNum(PreparationNodeEnum.EXECUTE_LEADER_VERIFY.getValue());
             updPre.setStatus(PreparationStatusEnum.PROCESSING.getValue());
             updPre.setRepairStartTime(LocalDateTime.now());
             updPre.setRepairUserId(model.getRepairUserId());
@@ -482,6 +484,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 }
                 if (model.getVerifyStatus() == 1) { // 通过
                     updPre.setStatus(PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue());
+                    updPre.setNodeNum(PreparationNodeEnum.APPLY_MANAGER_VERIFY.getValue());
                     queryDTO.setUserId(preparation.getApplyVerifyLeader());
                 } else if (model.getVerifyStatus() == 3) { // 回退
                     //根据回退的节点值，来判定状态和需要通知的用户
@@ -498,6 +501,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                     throw new DeniedException("不具备审核权限");
                 }
                 if (model.getVerifyStatus() == 1) { // 通过
+                    updPre.setNodeNum(PreparationNodeEnum.APPLY_LEADER_VERIFY.getValue());
                     updPre.setStatus(PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue());
                     queryDTO.setUserId(preparation.getReceiveVerifyLeader());
                 } else if (model.getVerifyStatus() == 3) { // 回退
@@ -518,6 +522,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 updPre.setFee(model.getFee());
                 //model.setVerifyRemark(model.getVerifyRemark() + "【费用"+preparation.getFee() + "->"+model.getFee() + "】");
                 if (model.getVerifyStatus() == 1) { // 通过
+                    updPre.setNodeNum(PreparationNodeEnum.EXECUTING.getValue());
                     updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING.getValue());
                     queryDTO.setUserId(preparation.getRepairUserId());
                 } else if (model.getVerifyStatus() == 3) { // 回退
@@ -535,6 +540,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                     throw new DeniedException("不具备审核权限");
                 }
                 if (model.getVerifyStatus() == 1) { // 通过
+                    updPre.setNodeNum(PreparationNodeEnum.FINISHED.getValue());
                     updPre.setStatus(PreparationStatusEnum.FINISHED.getValue());
                 } else if (model.getVerifyStatus() == 3) { // 回退
                     //根据回退的节点值，来判定状态和需要通知的用户