修复维修上报

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

@@ -450,6 +450,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
      */
     @Override
     public void stopRepairByPerson(RepairApplicationFormDTO model) {
+        String roles = StringUtils.getRoles();
         if(StringUtils.isBlank(model.getReportLeaderId())){
             throw new DeniedException("上报对象不能为空");
         }
@@ -458,23 +459,23 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         }
         // 1、完善终止人的维修记录
         RepairApplicationForm form = repairApplicationFormMapper.selectById(model.getId());
-        editRepairRecord(model,CommonConstants.REPAIR_RECORD_EDIT_STOP);
         // 2、回写并修改维修表
         // 根据角色判断自己上报人角色
         RepairApplicationForm updRepair = new RepairApplicationForm();
         updRepair.setId(model.getId());
         updRepair.setRemarkTwo(model.getRemark());
-        updRepair.setRepairUserId(model.getReportLeaderId());
+       /* updRepair.setRepairUserId(model.getReportLeaderId());
         if(model.getRoleType() != null && model.getRoleType() == 3){ // 更新维修单的区域负责人
             updRepair.setReportLeaderId(model.getReportLeaderId());
-        }
-        /*if(roles.contains(SysRoleCodeEnum.Maintenance.name())){
-            // 更新维修人
-            updRepair.setRepairUserId(model.getReportLeaderId());
-        }else if(roles.contains(SysRoleCodeEnum.Maintenance_Leader.name())){
-            // 班组长上报
-            updRepair.setDispatchUserId(model.getReportLeaderId());
         }*/
+        if(roles.contains(SysRoleCodeEnum.Maintenance_Leader.name())){
+            // 班组长上报,修改所属工程师
+            editRepairRecord(model,CommonConstants.REPAIR_RECORD_EDIT_STOP);
+            updRepair.setDispatchUserId(model.getReportLeaderId());
+        }else if(roles.contains(SysRoleCodeEnum.REPAIR_MANAGE.name())){
+            // 工程师上报
+            updRepair.setReportLeaderId(model.getReportLeaderId());
+        }
         updRepair.setStatus(RepairApplicationFormStatusEnum.REPAIR_FAIL.getValue());
         repairApplicationFormMapper.updateByPrimaryKeySelective(updRepair);
         // 3、状态记录表