部门和角色

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -444,7 +444,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             info.setActualUser(model.getActualUser());
             sbInfoService.updateStatus(info);
         }
-        form.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+        form.setStatus(RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue());
         form.setApplyTime(LocalDateTime.now());
         form.setCreatedTime(model.getApplyTime());
         form.setUpdateTime(model.getApplyTime());
@@ -818,49 +818,51 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
     @Override
     public void handleCallRepair(RepairApplicationFormDTO model) {
         RepairApplicationForm queryForm = repairApplicationFormMapper.selectById(model.getId());
-        if(queryForm == null || queryForm.getStatus() != RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){
-            throw new DeniedException("审核的报修单不存在或已审核");
-        }
-        RepairApplicationForm updForm = new RepairApplicationForm();
-        updForm.setId(model.getId());
-        if(model.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
-            // 通过报修
-            updForm.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
-        }else if(model.getStatus() == RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue()){
-            updForm.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue());
-        }else {
-            throw new DeniedException("提交状态值非法");
-        }
-        updForm.setVerifyRepairRemark(model.getVerifyRepairRemark());
-        repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
-        // 给生产工程师和区域负责人发信息
-        List<SysUserVO> sysUserVOList = getRepairMangers(queryForm.getRepairDeptId(),null,SysRoleCodeEnum.REPAIR_MANAGE.name());
-        if(sysUserVOList == null || sysUserVOList.size() ==0){
-            throw new DeniedException("该维修部门，没有工程师，请确认！");
-        }
-        List<SysUserVO> mmScb = ListUtils.newArrayList();
-        sysUserVOList.forEach(item->{
-            mmScb.add(item);
-        });
-        sysUserVOList = getRepairMangers(null,null,SysRoleCodeEnum.MM.name());
-        if(sysUserVOList != null && sysUserVOList.size() > 0){
-            sysUserVOList.forEach(item->{
-                mmScb.add(item);
-            });
-        }
-        sysUserVOList = getRepairMangers(null,null,SysRoleCodeEnum.SCB.name());
-        if(sysUserVOList != null && sysUserVOList.size() > 0){
+        if(queryForm == null){
+            throw new DeniedException("审核的报修单不存");
+        }
+        if(queryForm.getStatus() == RepairApplicationFormStatusEnum.REPAIR_VERIFYING.getValue()){ // 非待审状态，不走
+            RepairApplicationForm updForm = new RepairApplicationForm();
+            updForm.setId(model.getId());
+            if(model.getStatus() == RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue()){
+                // 通过报修
+                updForm.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+            }else if(model.getStatus() == RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue()){
+                updForm.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_CANCEL.getValue());
+            }else {
+                throw new DeniedException("提交状态值非法");
+            }
+            updForm.setVerifyRepairRemark(model.getVerifyRepairRemark());
+            repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
+            // 给生产工程师和区域负责人发信息
+            List<SysUserVO> sysUserVOList = getRepairMangers(queryForm.getRepairDeptId(),null,SysRoleCodeEnum.REPAIR_MANAGE.name());
+            if(sysUserVOList == null || sysUserVOList.size() ==0){
+                throw new DeniedException("该维修部门，没有工程师，请确认！");
+            }
+            List<SysUserVO> mmScb = ListUtils.newArrayList();
             sysUserVOList.forEach(item->{
                 mmScb.add(item);
             });
-        }
-        addRepairStatusRecord(updForm,"报修审核");
-        sendMessageToRepairManger(queryForm,mmScb,CommonConstants.CALL_REPAIR_NOTICE);
-        // 给值班人员发送消息
-        if(isSendMessage()){
-            String everyWhereUsers = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_TWENTY_FOUR_USER.name());
-            if(StringUtils.isNotBlank(everyWhereUsers)){
-                sendMessageToRepairManger(queryForm,getUserVOs(everyWhereUsers.trim()),CommonConstants.CALL_REPAIR_NOTICE);
+            sysUserVOList = getRepairMangers(null,null,SysRoleCodeEnum.MM.name());
+            if(sysUserVOList != null && sysUserVOList.size() > 0){
+                sysUserVOList.forEach(item->{
+                    mmScb.add(item);
+                });
+            }
+            sysUserVOList = getRepairMangers(null,null,SysRoleCodeEnum.SCB.name());
+            if(sysUserVOList != null && sysUserVOList.size() > 0){
+                sysUserVOList.forEach(item->{
+                    mmScb.add(item);
+                });
+            }
+            addRepairStatusRecord(updForm,"报修审核");
+            sendMessageToRepairManger(queryForm,mmScb,CommonConstants.CALL_REPAIR_NOTICE);
+            // 给值班人员发送消息
+            if(isSendMessage()){
+                String everyWhereUsers = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_TWENTY_FOUR_USER.name());
+                if(StringUtils.isNotBlank(everyWhereUsers)){
+                    sendMessageToRepairManger(queryForm,getUserVOs(everyWhereUsers.trim()),CommonConstants.CALL_REPAIR_NOTICE);
+                }
             }
         }
     }