guarantee-lsq 2 年之前
父节点
当前提交
86aec2eb42

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

@@ -489,6 +489,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     statusList.add(RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.HANG_UP.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.HANG_UP.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.DISPATCH_REPAIR.getValue());
                     statusList.add(RepairApplicationFormStatusEnum.DISPATCH_REPAIR.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_ONE.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFY_FAIL_ONE.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_TWO.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFY_FAIL_TWO.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_THREE.getValue());
+                    statusList.add(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFY_FAIL_THREE.getValue());
                 }else if(record.getSearchType() == 2){ // 我的维修--废弃
                 }else if(record.getSearchType() == 2){ // 我的维修--废弃
                     record.setRepairUserId(userInfo.getUserId());
                     record.setRepairUserId(userInfo.getUserId());
                 }else if(record.getSearchType() == 3){ // 接单大厅-维修人和班组长
                 }else if(record.getSearchType() == 3){ // 接单大厅-维修人和班组长
@@ -779,6 +785,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         List<SysFile> applicationFileList = ListUtils.newArrayList();
         List<SysFile> applicationFileList = ListUtils.newArrayList();
         List<SysFile> repairFileList = ListUtils.newArrayList();
         List<SysFile> repairFileList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
         List<SysFile> checkFileList = ListUtils.newArrayList();
+        List<SysFile> reportFile = ListUtils.newArrayList();
         sysFiles.forEach(item -> {
         sysFiles.forEach(item -> {
             if (item.getType().equals(SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue())) {
             if (item.getType().equals(SysFileTypeEnum.REPAIR_APPLICATION_IMGS.getValue())) {
                 applicationFileList.add(item);
                 applicationFileList.add(item);

+ 1 - 1
platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanPlanRepairStrategy.java

@@ -633,7 +633,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
     public void applyVerify(RepairApplicationFormDTO model) {
     public void applyVerify(RepairApplicationFormDTO model) {
         // 判断是否具有权限
         // 判断是否具有权限
         String roles = getCurrentRoles();
         String roles = getCurrentRoles();
-        if(!roles.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
+        if(!roles.contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) && !roles.contains(SysRoleCodeEnum.MM.name())){
             throw new DeniedException("对不起,您不具有权限");
             throw new DeniedException("对不起,您不具有权限");
         }
         }
         String produceUser = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.PRODUCE_VERIFY_USERS.name());
         String produceUser = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.PRODUCE_VERIFY_USERS.name());