筹建优化

platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationVO.java

@@ -208,4 +208,6 @@ public class PreparationVO extends BaseVO implements Serializable {
 
     private BigDecimal actualFee; // 实际费用
 
+    private BigDecimal waitHandleNum; // 待办数量
+
 }

platform-dao/src/main/resources/mapper/preparation/PreparationMapper.xml

@@ -195,16 +195,17 @@
         select status, count(1) counts from t_preparation
         <where>
             <if test="applyVerifyUserId != null and applyVerifyUserId != ''">
-                and apply_verify_user_id = #{applyVerifyUserId}
+                and (user_id = #{applyVerifyUserId} or apply_verify_user_id = #{applyVerifyUserId})
             </if>
             <if test="userId !=null and userId !='' ">
                 and user_id = #{userId}
             </if>
             <if test="repairUserId!=null and repairUserId!=''">
-                and repair_user_id = #{repairUserId}
+                and (user_id = #{repairUserId} or repair_user_id = #{repairUserId})
             </if>
             <if test="tempUserId != null and tempUserId != ''">
                 and (receive_verify_leader = #{tempUserId}
+                or user_id = #{tempUserId}
                 or apply_verify_leader = #{tempUserId})
             </if>
             <if test="delUserId != null and delUserId != ''">

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

@@ -234,7 +234,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         // 获取用户角色
         String roles = getRoleCodes();
         int roleFlag = 1; // 1 申请人 2 执行人 3 部门主管 4 部门负责人
-        if(userInfo.getSuperAdmin() != 1){
+        //if(userInfo.getSuperAdmin() != 1){
             record.setDelUserId(userInfo.getUserId());
             if(roles.contains(SysRoleCodeEnum.DEPT_LEADER.name())){
                 // 部门负责人(执行和申请)
@@ -252,38 +252,40 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 // 申请人
                 record.setUserId(userInfo.getUserId());
             }
-        }
-        //record.setTempUserId(userInfo.getUserId());
+        //}
         if (record.getSearchType() != null && record.getStatus() == null) {
             List<Integer> statusList = new ArrayList<>();
             if (record.getSearchType() == 1) { // 待派工单
                 statusList.add(PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue());
                 record.setTempUserId(null);
                 record.setStatusList(statusList);
-            } else if (record.getSearchType() == 2) { // 待审核工单
+            } else if (record.getSearchType() == 2) { // 待办工单
                 switch (roleFlag){
                     case 1:
-                        statusList.add(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
+                        statusList.add(PreparationStatusEnum.APPLY_MANAGER_VERIFY_BACK.getValue());
                         statusList.add(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
                         break;
                     case 2:
-                        statusList.add(PreparationStatusEnum.BLANK.getValue());
+                        statusList.add(PreparationStatusEnum.SECOND_PROCESSING.getValue());
+                        statusList.add(PreparationStatusEnum.PROCESSING.getValue());
                         break;
                     case 3:
                         statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
+                        statusList.add(PreparationStatusEnum.APPLY_LEADER_VERIFY_BACK.getValue());
                         break;
                     case 4:
                         statusList.add(PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue());
                         statusList.add(PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue());
+                        statusList.add(PreparationStatusEnum.RECEIVE_VERIFY_BACK.getValue());
                         break;
                 }
                 record.setStatusList(statusList);
             } else if (record.getSearchType() == 3) { // 我的工单
             }
             // 超级管理员可以看到各个状态下的所有数据 相关领导，可以在这里进行设置
-            if (userInfo.getSuperAdmin() == 1) {
+            /*if (userInfo.getSuperAdmin() == 1) {
                 record.setTempUserId(null);
-            }
+            }*/
         }
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(record));
@@ -457,6 +459,10 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         updPre.setRepairMinutes(DateUtils.getDurationHours(preparation.getRepairStartTime(), updPre.getRepairEndTime()));
         updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
         mapper.updateByPrimaryKeySelective(updPre);
+        // 保存文件图片
+        if(model.getImageList() != null && model.getImageList().size() > 0){
+            sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_IMGS.getValue(), model.getImageList());
+        }
         // 添加状态记录
         addRecord(updPre,PreparationRecordTypeEnum.FLOW.getValue(), "");
         // 给申请人发消息
@@ -888,7 +894,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         }
         Preparation updPre = new Preparation();
         updPre.setId(model.getId());
-        updPre.setStatus(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
+        updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING.getValue());
         updPre.setFee(model.getFee());
         updPre.setFeeContent(model.getFeeContent());
         updPre.setRepairContent(model.getRepairContent());
@@ -905,11 +911,11 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         // 添加审核记录
         addRecord(updPre,PreparationRecordTypeEnum.VERIFY.getValue(), "同意");
         // 给申请人发消息
-        SysUserDTO sendDTO = new SysUserDTO();
+        /*SysUserDTO sendDTO = new SysUserDTO();
         sendDTO.setUserId(preparation.getUserId());
         List<SysUserVO> sendUsers = sysUserMapper.getSysUserVO(sendDTO);
         updPre.setNo(preparation.getNo());
-        sendMessageToApplyLeader(sendUsers, updPre);
+        sendMessageToApplyLeader(sendUsers, updPre);*/
     }
 
     @Override
@@ -922,7 +928,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         String roles = getRoleCodes();
         // 角色标识
         int roleFlag = 1; // 1 申请人 2 执行人 3 部门主管 4 部门负责人
-        if(userInfo.getSuperAdmin() != 1){
+        //if(userInfo.getSuperAdmin() != 1){
             preparationDTO.setDelUserId(userInfo.getUserId());
             if(roles.contains(SysRoleCodeEnum.DEPT_LEADER.name())){
                 // 部门负责人(执行和申请)
@@ -940,24 +946,27 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 // 申请人
                 preparationDTO.setUserId(userInfo.getUserId());
             }
-        }
+        //}
         List<PreparationVO> preparationVOS = mapper.getCountByUserId(preparationDTO);
         vo.setWaitVerifyNum(initNum);
         vo.setRefusedNum(initNum);
         vo.setBackNum(initNum);
         vo.setWorkingNum(initNum);
+        vo.setWaitHandleNum(initNum);
+        BigDecimal waitNum = initNum;
         if(preparationVOS != null && preparationVOS.size() > 0){
             for(PreparationVO item : preparationVOS){
                 BigDecimal tempVal = item.getCounts() == null ? initNum : item.getCounts();
                 switch (roleFlag){
                     case 1: // 申请人
-                        if (item.getStatus() == PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue() ||
-                                item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue()){ // 待审核
+                        if (item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue()){ // 待审核
                             vo.setWaitVerifyNum(vo.getWaitVerifyNum().add(tempVal));
+                            waitNum = waitNum.add(tempVal);
                         }else if(item.getStatus() == PreparationStatusEnum.CLOSE.getValue()){ // 被拒工单
                             vo.setRefusedNum(vo.getRefusedNum().add(tempVal));
                         }else if(item.getStatus() == PreparationStatusEnum.APPLY_MANAGER_VERIFY_BACK.getValue()){ // 回退
                             vo.setBackNum(vo.getBackNum().add(tempVal));
+                            waitNum = waitNum.add(tempVal);
                         }else if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){
                             // 执行工单
                             vo.setWorkingNum(vo.getWorkingNum().add(tempVal));
@@ -972,15 +981,18 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                         }else if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue() || item.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
                             // 执行工单
                             vo.setWorkingNum(vo.getWorkingNum().add(tempVal));
+                            waitNum = waitNum.add(tempVal);
                         }
                         break;
                     case 3: // 部门主管
                         if (item.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){ // 待审核
                             vo.setWaitVerifyNum(vo.getWaitVerifyNum().add(tempVal));
+                            waitNum = waitNum.add(tempVal);
                         }else if(item.getStatus() == PreparationStatusEnum.CLOSE.getValue()){ // 被拒工单
                             vo.setRefusedNum(vo.getRefusedNum().add(tempVal));
                         }else if(item.getStatus() == PreparationStatusEnum.APPLY_LEADER_VERIFY_BACK.getValue()){ // 回退工单
                             vo.setBackNum(vo.getBackNum().add(tempVal));
+                            waitNum = waitNum.add(tempVal);
                         }else if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){
                             // 执行工单
                             vo.setWorkingNum(vo.getWorkingNum().add(tempVal));
@@ -991,10 +1003,12 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                         if (item.getStatus() == PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue() ||
                                 item.getStatus() == PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue()){ // 待审核
                             vo.setWaitVerifyNum(vo.getWaitVerifyNum().add(tempVal));
+                            waitNum = waitNum.add(tempVal);
                         }else if(item.getStatus() == PreparationStatusEnum.CLOSE.getValue()){ // 被拒工单
                             vo.setRefusedNum(vo.getRefusedNum().add(tempVal));
                         }else if(item.getStatus() == PreparationStatusEnum.RECEIVE_VERIFY_BACK.getValue()){ // 待审核
                             vo.setBackNum(vo.getBackNum().add(tempVal));
+                            waitNum = waitNum.add(tempVal);
                         }else if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){
                             // 执行工单
                             vo.setWorkingNum(vo.getWorkingNum().add(tempVal));
@@ -1003,6 +1017,8 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 }
             }
         }
+        // 待办工单
+        vo.setWaitHandleNum(waitNum);
         return vo;
     }