小程序优化

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

@@ -355,7 +355,11 @@ public class RepairApplicationFormController {
     public R getRepairApplicationForm() {
 //        UserInfo userInfo=new UserInfo();
 //        List list=new ArrayList();
+//        list.add("workplace_store_normal");
 //        list.add("workplace_store_manage");
+//        list.add("workplace-repair-normal");
+//        list.add("workplace-repair-manage");
+//        list.add("REPAIR_MANAGE");
 //        userInfo.setUserId("629ff44ad2b1150bf0e3f834");
 //        userInfo.setRoleCodes(list);
 //        userInfo.setSuperAdmin(0);

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

@@ -245,12 +245,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
 //        UserInfo userInfo=new UserInfo();
 //        userInfo.setSuperAdmin(0);
 //        List list=new ArrayList();
-//        list.add("workplace_store_normal");
-//        list.add("workplace_store_manage");
-//        list.add("workplace-repair-normal");
-//        list.add("workplace-repair-manage");
-//        list.add("REPAIR_MANAGE");
-//        userInfo.setUserId("629ff44ad2b1150bf0e3f834");
+//
+//        list.add("Maintenance");
+//        userInfo.setUserId("629ec5456f900a3658c472b5");
 //        userInfo.setRoleCodes(list);
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();
         OutStoreFormDTO outStoreFormDTO=new OutStoreFormDTO();
@@ -458,9 +455,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         UserInfo userInfo=SecurityUtils.getUserInfo();
 //        UserInfo userInfo=new UserInfo();
 //        List list=new ArrayList();
-//        list.add("维修人员");
-//        list.add("Maintenance");
-//        userInfo.setUserId("629ec5456f900a3658c472b5");
+//        list.add("workplace_store_normal");
+//        list.add("workplace_store_manage");
+//        list.add("workplace-repair-normal");
+//        list.add("workplace-repair-manage");
+//        list.add("REPAIR_MANAGE");
+//        userInfo.setUserId("629ff44ad2b1150bf0e3f834");
 //        userInfo.setRoleCodes(list);
 //        userInfo.setSuperAdmin(0);
         // 根据用户的角色来定
@@ -475,23 +475,23 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 roleFlag=1;
                 // 维修主管
                 repairApplicationFormDTO.setDispatchUserId(userInfo.getUserId());
-                //带派工
-                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
-                //维修完成
-                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.FINISHED.getValue());
-                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REBACK.getValue());
+//                //带派工
+//                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+//                //维修完成
+//                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.FINISHED.getValue());
+//                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REBACK.getValue());
             }else if(role.contains(SysRoleCodeEnum.REPAIR_EXAMINE.name())){
                 roleFlag=2;
                 // 报修+终审
                 repairApplicationFormDTO.setUserId(userInfo.getUserId());
                 //审核中
-                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
-                //保修驳回
-                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REFUSED_REPAIR.getValue());
+//                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+//                //保修驳回
+//                repairApplicationFormDTO.getStatusList().add(RepairApplicationFormStatusEnum.REFUSED_REPAIR.getValue());
             }else if(role.contains(SysRoleCodeEnum.Maintenance.name())){
                 roleFlag=3;
                 repairApplicationFormDTO.setRepairUserId(userInfo.getUserId());
-                repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+//                repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
 //                repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
 //                repairApplicationFormVO.setRoleFlag(3);
             }
@@ -500,6 +500,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
         if(repairApplicationFormVO!=null){
             repairApplicationFormVO.setRoleFlag(roleFlag);
+            repairApplicationFormDTO.setStatus(repairApplicationFormVO.getStatus());
             count=mapper.getRepairCount1(repairApplicationFormDTO);
             repairApplicationFormVO.setRepairCount(count);
         }