优化

platform-dao/src/main/java/com/platform/dao/vo/NoticeNumberVO.java

@@ -24,15 +24,20 @@ public class NoticeNumberVO implements Serializable {
                 =this.finishedNum=this.unexectuedMaintenanceNum=this.allBaoYangTaskNum=this.executedTaskNum
                 =this.timeOutTaskNum=this.inStoreNum=this.outStoreNum=this.pdNum=this.dbNum
                 =this.waitForExamineNum=this.waitForSignInNum=this.unreadNum
-                =this.myRepairNum=this.myCheckRepairNum =this.waitForReceiveNum= new BigDecimal(0);
+                =this.myRepairNum=this.myCheckRepairNum =this.waitForReceiveNum=this.inTheThirdChecking=this.bigRepairChecking= new BigDecimal(0);
     }
 
+    private BigDecimal inTheThirdChecking;//报修三审审核中
+
+    private BigDecimal bigRepairChecking;//大修审核中
+
     //维修
     //维修中
     private BigDecimal inTheMaintenanceNum;
     //待分配
     private BigDecimal waitForDistributionNum;
 
+
     //待工程师审核
     private BigDecimal repairCheckNum;
     //待生产审核

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

@@ -248,6 +248,15 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     }
                     //维修人
                 }
+                else if (noticeNumberVO.getRoleFlag() == 4){
+                    //计划性维修生产审核
+                    if (vo.getStatus() == RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_THREE.getValue()){
+                        noticeNumberVO.setInTheThirdChecking(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                    if (vo.getStatus() == RepairApplicationFormStatusEnum.BIG_REPAIR_VERIFYING.getValue()){
+                        noticeNumberVO.setBigRepairChecking(vo.getRepairCount()==null?initNum:vo.getRepairCount());
+                    }
+                }
                 //待分配
 //                if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
 //                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?initNum:vo.getRepairCount());
@@ -394,6 +403,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 repairApplicationFormVOS= mapper.getRepairCount(repairApplicationFormDTO);
                 noticeNumberVO=addRepairNums(noticeNumberVO,repairApplicationFormVOS);
             }
+            else if (sb.toString().contains(SysRoleCodeEnum.VERIFY_REPAIR.name())){
+                noticeNumberVO.setRoleFlag(4);//计划性维修生产审核
+                repairApplicationFormDTO.setProduceVerifyUserId(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);//维修人就是班组长