guarantee-lsq hai 1 ano
pai
achega
def19aaebf

+ 9 - 3
platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -499,9 +499,15 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         PageHelper.startPage(pageNum, pageSize);
         UserInfo userInfo = SecurityUtils.getUserInfo();
         record.setTempUserId(userInfo.getUserId());
-        /*if(record.getStatus() != null && record.getStatus() == -1){
-            record.setStatus(null);
-        }*/
+        if(record.getStatus() != null && record.getStatus() == 99){
+            List<Integer> statusList = ListUtils.newArrayList();
+            statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
+            statusList.add(PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue());
+            statusList.add(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
+            statusList.add(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
+            statusList.add(PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue());
+            record.setStatusList(statusList);
+        }
         return new MyPage(mapper.selectList(record));
     }
 

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

@@ -338,7 +338,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue() ||
                     vo.getStatus() == PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue() ||
                     vo.getStatus() == PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue() ||
-                    vo.getStatus() == PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue()){
+                    vo.getStatus() == PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue() ||
+                    vo.getStatus() == PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue()){
                 // 待审核
                 noticeNumberVO.setNotDealNum(noticeNumberVO.getNotDealNum().add(tempVal));
             }else if (vo.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){
@@ -347,7 +348,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             }
             else if (vo.getStatus() == PreparationStatusEnum.FINISHED.getValue()){
                 // 已完成
-                noticeNumberVO.setFinishNum(noticeNumberVO.getFinishedNum().add(tempVal));
+                noticeNumberVO.setFinishNum(noticeNumberVO.getFinishNum().add(tempVal));
             }
             else if (vo.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
                 // 费用审核