Merge remote-tracking branch 'origin/demo_' into demo_

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

@@ -84,6 +84,10 @@ public enum PreparationStatusEnum {
      * 审核拒绝--工单关闭
      */
     CLOSE(18),
+    /**
+     * 空白状态
+     */
+    BLANK(19),
     ;
     private final Integer value;
 }

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

@@ -220,7 +220,6 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
 
     @Override
     public AbstractPageResultBean<PreparationVO> selectPageList(PreparationDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
         UserInfo userInfo = SecurityUtils.getUserInfo();
         // 获取用户角色
         String roles = getRoleCodes();
@@ -258,6 +257,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                         statusList.add(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
                         break;
                     case 2:
+                        statusList.add(PreparationStatusEnum.BLANK.getValue());
                         break;
                     case 3:
                         statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
@@ -275,6 +275,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 record.setTempUserId(null);
             }
         }
+        PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(record));
     }
 
@@ -366,8 +367,9 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
             updPre.setExecuteDept(model.getExecuteDept());
             queryDTO.setUserId(preparation.getUserId());
         } else if (model.getVerifyStatus() == 3) { // 回退
-            updPre.setStatus(PreparationStatusEnum.RECEIVE_VERIFY_BACK.getValue());
-            queryDTO.setUserId(preparation.getApplyVerifyLeader());
+            queryDTO.setUserId(getNotifyUserId(model,updPre,preparation));
+            /*updPre.setStatus(PreparationStatusEnum.RECEIVE_VERIFY_BACK.getValue());
+            queryDTO.setUserId(preparation.getApplyVerifyLeader());*/
         } else { // 拒绝
             updPre.setStatus(PreparationStatusEnum.CLOSE.getValue());
             queryDTO.setUserId(preparation.getApplyVerifyLeader());
@@ -378,7 +380,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         addRecord(preparation,PreparationRecordTypeEnum.FLOW.getValue(), "");
         // 添加审批记录
         addRecord(preparation,PreparationRecordTypeEnum.VERIFY.getValue(), model.getVerifyRemark());
-        queryDTO.setUserId(model.getRepairUserId());
+        //queryDTO.setUserId(model.getRepairUserId());
         List<SysUserVO> userVOS = sysUserMapper.getSysUserVO(queryDTO);
         // 给具体处理人发送消息
         sendMessageToApplyLeader(userVOS, preparation);
@@ -611,30 +613,36 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
             case 1:
                 // 申请人
                 updPre.setStatus(PreparationStatusEnum.APPLY_MANAGER_VERIFY_BACK.getValue());
+                updPre.setNodeNum(PreparationNodeEnum.APPLY.getValue());
                 userId = preparation.getUserId();
                 break;
             case 2:
                 // 申请部门主管
+                updPre.setNodeNum(PreparationNodeEnum.APPLY_MANAGER_VERIFY.getValue());
                 updPre.setStatus(PreparationStatusEnum.APPLY_LEADER_VERIFY_BACK.getValue());
                 userId = preparation.getApplyVerifyUserId();
                 break;
             case 3:
                 // 申请部门负责人
+                updPre.setNodeNum(PreparationNodeEnum.APPLY_LEADER_VERIFY.getValue());
                 updPre.setStatus(PreparationStatusEnum.RECEIVE_VERIFY_BACK.getValue());
                 userId = preparation.getApplyVerifyLeader();
                 break;
             case 4:
                 // 执行部门负责人
+                updPre.setNodeNum(PreparationNodeEnum.EXECUTE_LEADER_VERIFY.getValue());
                 updPre.setStatus(PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue());
                 userId = preparation.getReceiveVerifyLeader();
                 break;
             case 5:
                 // 执行人-接单
+                updPre.setNodeNum(PreparationNodeEnum.EXECUTING.getValue());
                 updPre.setStatus(PreparationStatusEnum.FIRST_PROCESSING_VERIFY_BACK.getValue());
                 userId = preparation.getRepairUserId();
                 break;
             case 6:
                 // 申请人-执行
+                updPre.setNodeNum(PreparationNodeEnum.FINISHED.getValue());
                 updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING_BACK.getValue());
                 userId = preparation.getRepairUserId();
                 break;