Merge remote-tracking branch 'origin/demo_' into demo_

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

@@ -500,7 +500,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                         noticeNumberVO.setNotDealNum(noticeNumberVO.getNotDealNum().add(tempVal));
                     }else if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){ // 执行中
                         noticeNumberVO.setYesDealNum(noticeNumberVO.getYesDealNum().add(tempVal));
-                    }else if(item.getStatus() == PreparationStatusEnum.FINISHED.getValue()){ // 已完成
+                    }else if(item.getStatus() == PreparationStatusEnum.APPLY_MANAGER_VERIFY_BACK.getValue()){ // 回退
                         noticeNumberVO.setFinishNum(noticeNumberVO.getFinishNum().add(tempVal));
                     }else if(item.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
                         // 费用审核
@@ -510,7 +510,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 case 2: // 执行人
                     if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){ // 执行中
                         noticeNumberVO.setYesDealNum(noticeNumberVO.getYesDealNum().add(tempVal));
-                    }else if(item.getStatus() == PreparationStatusEnum.FINISHED.getValue()){ // 已完成
+                    }else if(item.getStatus() == PreparationStatusEnum.FIRST_PROCESSING_VERIFY_BACK.getValue() ||
+                            item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING_BACK.getValue()){ // 回退
                         noticeNumberVO.setFinishNum(noticeNumberVO.getFinishNum().add(tempVal));
                     }else if(item.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
                         // 费用审核
@@ -522,7 +523,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                         noticeNumberVO.setNotDealNum(noticeNumberVO.getNotDealNum().add(tempVal));
                     }else if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){ // 执行中
                         noticeNumberVO.setYesDealNum(noticeNumberVO.getYesDealNum().add(tempVal));
-                    }else if(item.getStatus() == PreparationStatusEnum.FINISHED.getValue()){ // 已完成
+                    }else if(item.getStatus() == PreparationStatusEnum.APPLY_LEADER_VERIFY_BACK.getValue()){ // 回退
                         noticeNumberVO.setFinishNum(noticeNumberVO.getFinishNum().add(tempVal));
                     }else if(item.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
                         // 费用审核
@@ -535,7 +536,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                         noticeNumberVO.setNotDealNum(noticeNumberVO.getNotDealNum().add(tempVal));
                     }else if(item.getStatus() == PreparationStatusEnum.SECOND_PROCESSING.getValue()){ // 执行中
                         noticeNumberVO.setYesDealNum(noticeNumberVO.getYesDealNum().add(tempVal));
-                    }else if(item.getStatus() == PreparationStatusEnum.FINISHED.getValue()){ // 已完成
+                    }else if(item.getStatus() == PreparationStatusEnum.RECEIVE_VERIFY_BACK.getValue()){ // 回退
                         noticeNumberVO.setFinishNum(noticeNumberVO.getFinishNum().add(tempVal));
                     }else if(item.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
                         // 费用审核