计划维修完善

platform-dao/src/main/java/com/platform/dao/enums/SysRoleCodeEnum.java

@@ -128,6 +128,11 @@ public enum SysRoleCodeEnum {
      * 龙岩报修人
      */
     REPAIR_EXAMINE,
+    /**
+     * 计划性维修
+     * 生产审核
+     */
+    VERIFY_REPAIR,
     /**
      * 报修派工角色
      */

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

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

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

@@ -459,6 +459,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     record.setRepairUserId(userInfo.getUserId());
                 }else if(roleArray.contains(SysRoleCodeEnum.MM.name())){
                     record.setReportLeaderId(userInfo.getUserId());
+                } else if(roleArray.contains(SysRoleCodeEnum.VERIFY_REPAIR.name())){
+                    record.setProduceVerifyUserId(userInfo.getUserId());
                 }
                 List<Integer> statusList = new ArrayList<>();
                 if(record.getSearchType() == 1){ // 我的工单--报修人，我的工单--工程师，我的工单--班组长
@@ -482,14 +484,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     record.setRepairDeptId(sysUserDeptMapper.selectDeptIdByUserId(userInfo.getUserId()));
                     record.setDispatchUserId(null);
                     statusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
-                }else if(record.getSearchType() == 5){ // 维修审核-维修主管，报修审核--报修人
+                }else if(record.getSearchType() == 5){ // 维修审核-工程师和经理，生产审核--报修人
                     // 根据角色-不同赋值
                     if(roleArray.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
                         // 维修工程师
                         statusList.add(RepairApplicationFormStatusEnum.WAIT_SUBMIT.getValue());
-                    }else if(roleArray.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
-                        // 报修人
-                        statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
+                        statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_ONE.getValue()); // 计划维修审核
+                    }else if(roleArray.contains(SysRoleCodeEnum.VERIFY_REPAIR.name())){ // 生产审核
+                        // 生产审核
+                        statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_THREE.getValue());
+                        statusList.add(RepairApplicationFormStatusEnum.BIG_REPAIR_VERIFYING.getValue());
+                    }else if(roleArray.contains(SysRoleCodeEnum.MM.name())){
+                        // 经理审核
+                        statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_TWO.getValue());
                     }
                 }else if(record.getSearchType() == 6){ // 报修审批-生产--暂时废弃
                     statusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
@@ -508,6 +515,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     }else{
                         statusList.add(RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue());
                     }
+                }else if(record.getSearchType() == 9){ // 待关闭工单
+                    statusList.add(RepairApplicationFormStatusEnum.FINISHED.getValue());
                 }
                 // 超级管理员可以看到各个状态下的所有数据 相关领导，可以在这里进行设置
                 if(userInfo.getSuperAdmin() == 1 || record.getSearchType() == -1){