简易维修

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -242,7 +242,7 @@ public class RepairApplicationFormController {
      */
     @GetMapping("/dispatch/page")
     public R queryDispatch(RepairApplicationFormDTO repairApplicationFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-        MyVOPage<RepairApplicationFormVO> pageInfos = repairApplicationFormService.selectPageInfoVO(repairApplicationFormDTO, pageNum, pageSize);
+        MyVOPage<RepairApplicationFormVO> pageInfos = repairApplicationFormService.selectPageInfoVODispatch(repairApplicationFormDTO, pageNum, pageSize);
         return new R<>(pageInfos);
     }
 

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

@@ -1041,11 +1041,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 }else if(record.getSearchType() == 2){ // 我的工单
                     statusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.FINISHED.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.MM_REPAIR_CLOSE.getValue());
                 }else if(record.getSearchType() == 3){ // 待审核工单
-                    statusList.add(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
                 }
-
                 record.setStatusList(statusList);
             }
             // 排除超级用户