1 năm trước cách đây
mục cha
commit
e70fac372e

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

@@ -714,9 +714,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     }
     private void addRepairNums2(List<RepairCount> list,NoticeNumberVO2 noticeNumberVO2){
         for (RepairCount count:list){
-            if (count.getStatus()==RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){//待接单
-                noticeNumberVO2.setWaitForReceive(count.getNum());
-            }else if (count.getStatus()==RepairApplicationFormStatusEnum.PROCESSING.getValue()){
+             if (count.getStatus()==RepairApplicationFormStatusEnum.PROCESSING.getValue()){
                 //维修中
                 noticeNumberVO2.setInTheMaintenanceNum(count.getNum());
             }else if (count.getStatus()==RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue()){
@@ -743,6 +741,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
         StoreCheckJobDTO storeCheckJobDTO=new StoreCheckJobDTO();
+
+        RepairApplicationForm form = new RepairApplicationForm();
+        form.setStatus(1);
+        List<RepairApplicationForm> repairApplicationFormVOS = mapper.select(form);
+        noticeNumberVO2.setWaitForReceive(repairApplicationFormVOS==null?initNum:new BigDecimal(repairApplicationFormVOS.size()));
         if (userInfo.getSuperAdmin()==1){
             List<RepairCount> repairCounts = mapper.getrepairCount2(null);