小程序优化

platform-rest/src/main/resources/application-dev.yml

@@ -53,6 +53,7 @@ spring:
 # 直接放行URL
 ignore:
   urls:
+    - /upms/users/**
     - /repair/application-forms/**
     - /check/jobs/**
     - /repair/application-forms/**

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

@@ -121,32 +121,41 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             for (RepairApplicationFormVO vo : repairApplicationFormVOS) {
                 //超级管理员
                 if (noticeNumberVO.getRoleFlag()==0){
-                    if(vo.getStatus() == RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()) {
-                        noticeNumberVO.setProduceCheckNum(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.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()));
                     }
-                    //报修人生产审核
+                    //报修人
                 }else if(noticeNumberVO.getRoleFlag()==2){
-                    if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue()){
-                        noticeNumberVO.setProduceCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    //报修中
+                    if(vo.getStatus()== RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+                        noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
                     }
-                    //维修主管维修审核
+                    //维修主管
                 }else if(noticeNumberVO.getRoleFlag()==3){
-                    if(vo.getStatus()==RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
-                        noticeNumberVO.setRepairCheckNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+                    //带派工
+                    if(vo.getStatus()==RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+                        noticeNumberVO.setWaitForDistributionNum(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.NOT_ALLOCATED.getValue()) {
-                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
-                    //维修中
-                } else if (vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()) {
-                    noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
-                    //审核中
-                }else 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()) {
+//                    noticeNumberVO.setWaitForDistributionNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+//                    //维修中
+//                } else if (vo.getStatus() == RepairApplicationFormStatusEnum.PROCESSING.getValue()) {
+//                    noticeNumberVO.setInTheMaintenanceNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+//                    //审核中
+//                }else if (vo.getStatus() == RepairApplicationFormStatusEnum.FINISHED.getValue()) {
+//                    noticeNumberVO.setFinishedNum(vo.getRepairCount()==null?new BigDecimal(0):new BigDecimal(vo.getRepairCount()));
+//                }
             }
         }
         return noticeNumberVO;