小程序优化

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

@@ -64,6 +64,10 @@ public class NoticeNumberVO implements Serializable {
     //未读
     private BigDecimal unreadNum=new BigDecimal(0);
 
+    private BigDecimal myRepairNum=new BigDecimal(0);
+
+    private BigDecimal myCheckRepairNum=new BigDecimal(0);
+
 
 
 

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

@@ -124,27 +124,64 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     //报修中
                     if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
                         noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
-                        //维修中
-                    }if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
+                    }
+                    //维修中
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                         noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
+                    //待生产审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
+                    //待维修主管审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
                     //报修人
                 }else if(noticeNumberVO.getRoleFlag()==2){
                     //报修中
                     if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
                         noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
+                    //待生产审核
+                    if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
+                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
                     //维修主管
                 }else if(noticeNumberVO.getRoleFlag()==3){
                     //带派工
-                    if(vo.getStatus()==RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {
                         noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
+                    //维修中
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()){
+                        noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
+                    //待维修主管审核
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
+                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
                     //维修人
                 }else if(noticeNumberVO.getRoleFlag()==1){
                     if(vo.getStatus()==RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                         noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
+                    //已完成
+                    if(vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()){
+                        noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    }
                 }
                 //待分配
 //                if (vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()) {