维修优化

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -413,4 +413,8 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      */
     private String sbPositionId;
 
+    /**
+     * 1 维修人 2 班组长 3 工程师
+     */
+    private Integer roleType;
 }

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

@@ -354,6 +354,9 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         updRepair.setId(model.getId());
         updRepair.setRemarkTwo(model.getRemark());
         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());

platform-service/src/main/java/com/platform/service/upms/impl/SysUserServiceImpl.java

@@ -777,6 +777,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
     @Override
     public List<SysUserVO> getRepairUsers(SysUserDTO sysUserDTO) {
         if(sysUserDTO.getQueryType() == 1){
+            sysUserDTO.setDeptId(null);
             // 维修上报查询
             if(sysUserDTO.getRoleType() == 1){
                 sysUserDTO.setRoleCode(SysRoleCodeEnum.Maintenance_Leader.name());