报修审核

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -126,6 +126,9 @@
             <if test="repairFormType!=null and repairFormType!=''">
                 and application.repair_form_type=#{repairFormType}
             </if>
+            <if test="verifyRepairUserId != null and verifyRepairUserId != ''">
+                and application.verify_repair_user_id = #{verifyRepairUserId}
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object"

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -123,10 +123,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             for (RepairApplicationFormVO vo : repairApplicationFormVOS) {
                 //超级管理员
                 if (noticeNumberVO.getRoleFlag()==0){
-                    //报修中
-//                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-//                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
-//                    }
                     //维修中
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                         noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
@@ -267,17 +263,25 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     if (vo.getStatus() == RepairApplicationFormStatusEnum.BIG_REPAIR_VERIFYING.getValue()){
                         noticeNumberVO.setBigRepairChecking(vo.getRepairCount()==null?initNum:vo.getRepairCount());
                     }
+                }else if (noticeNumberVO.getRoleFlag() == 10){
+                    // 非计划维修报修审核
+                    // 维修中
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    // 待审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    // 已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    // 待接单
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+                        noticeNumberVO.setWaitForReceiveNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
                 }
-                //待分配
-//                if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
-//                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
-//                    //维修中
-//                } else if (vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()) {
-//                    noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
-//                    //审核中
-//                }else if (vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()) {
-//                    noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
-//                }
             }
         }
         return noticeNumberVO;
@@ -352,12 +356,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     public NoticeNumberVO getNoticeNumberVO() {
         NoticeNumberVO noticeNumberVO=new NoticeNumberVO();
         UserInfo userInfo=SecurityUtils.getUserInfo();
-//        UserInfo userInfo=new UserInfo();
-//        List list=new ArrayList();
-//        list.add("MM");
-//        userInfo.setSuperAdmin(0);
-//        userInfo.setUserId("630dc87e8cdeaf4ae4fe1ca9");
-//        userInfo.setRoleCodes(list);
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
         StoreCheckJobDTO storeCheckJobDTO=new StoreCheckJobDTO();
@@ -405,8 +403,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 BigDecimal overTimeCount=checkJobMapper.getReceiveOverTimeCount(checkJobDTO);
                 noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?initNum:overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
-            }else
-            if(sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){//工程师
+            }else if(sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){//工程师
                 //工程师可派单，可审核维修人和班组长（维修人其实就是班组长）的维修数据
                 noticeNumberVO.setRoleFlag(5);
                 repairApplicationFormDTO.setDispatchUserId(userInfo.getUserId());//派工
@@ -416,8 +413,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 outStoreFormDTO.setUserId(userInfo.getUserId());
                 outStoreFormDTO.setOutFlag(1);
                 noticeNumberVO = addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
-            }
-            else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
+            } else if(sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE)){
                 //维修管理员,先获取其deptid
                 noticeNumberVO.setRoleFlag(3);
                 String deptId=sysUserDeptMapper.selectDeptIdByUserId(userInfo.getUserId());
@@ -453,6 +449,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 repairApplicationFormDTO.setProduceVerifyUserId(userInfo.getUserId());
                 repairApplicationFormVOS = mapper.getRepairCount(repairApplicationFormDTO);
                 noticeNumberVO = addRepairNums(noticeNumberVO,repairApplicationFormVOS);
+            }else if (sb.toString().contains(SysRoleCodeEnum.REPAIR_VERIFY_USER.name())){
+                noticeNumberVO.setRoleFlag(10);// 非计划报修审核
+                repairApplicationFormDTO.setVerifyRepairUserId(userInfo.getUserId());
+                repairApplicationFormVOS = mapper.getRepairCount(repairApplicationFormDTO);
+                noticeNumberVO = addRepairNums(noticeNumberVO,repairApplicationFormVOS);
             }
             else if(sb.toString().contains(SysRoleCodeEnum.Maintenance.name()) || sb.toString().contains(SysRoleCodeEnum.Maintenance_Leader.name())){
                 noticeNumberVO.setRoleFlag(1);//维修人就是班组长
@@ -614,6 +615,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     record.setRepairDeptId(null);
                     record.setReportLeaderId(null);
                 }
+                // 前端报修审核
+                if(StringUtils.isNotBlank(record.getVerifyRepairUserId()) && record.getSearchType() == -1
+                        && 3 == record.getStatus()){
+                    record.setStatus(RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue());
+                }
                 record.setStatusList(statusList);
             }
         }