转大修

platform-dao/src/main/java/com/platform/dao/enums/SysRoleCodeEnum.java

@@ -154,7 +154,6 @@ public enum SysRoleCodeEnum {
      * 维修主管--区域负责人
      */
     MM,
-
     /**
      * 巡检人
      */
@@ -163,6 +162,14 @@ public enum SysRoleCodeEnum {
      * 巡检主管
      */
     FILL_CHECKER_LEADER,
+    /**
+     * 隐患整改负责人
+     */
+    HIDDEN_DANGER_DUTY_USER,
+    /**
+     * 隐患属地负责人
+     */
+    HIDDEN_DANGER_AREA_USER,
     ;
 
 }

platform-dao/src/main/java/com/platform/dao/util/MessageTemplateUtil.java

@@ -380,6 +380,10 @@ public class MessageTemplateUtil {
         return String.format("您的报修【%s】已开始维修，请等待", id);
     }
 
+    public static String getBigRepairVerify(String id) {
+        return String.format("维修单【%s】申请转大修，请审核", id);
+    }
+
     public static String getApplyVerify(String id) {
         return String.format("计划性报修单【%s】申请维修，请知悉", id);
     }

platform-rest/src/main/java/com/platform/rest/controller/hidden/HiddenDangerController.java

@@ -2,6 +2,7 @@ package com.platform.rest.controller.hidden;
 
 import com.platform.common.util.R;
 import com.platform.dao.dto.hidden.HiddenDangerDTO;
+import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.hidden.HiddenDanger;
 import com.platform.service.hidden.HiddenDangerService;
 import com.platform.dao.util.ExcelUtil;
@@ -10,6 +11,7 @@ import com.platform.dao.vo.query.hidden.HiddenDangerVO;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
+import com.platform.service.upms.SysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 public class HiddenDangerController {
 
   private final  HiddenDangerService hiddenDangerService;
+  private final SysUserService sysUserService;
 
   /**
    * 通过id查询单条记录
@@ -152,4 +155,15 @@ public class HiddenDangerController {
     ExcelUtil.exportResponseDict(response, ExportHiddenDangerVO.class, BeanConverterUtil.copyListProperties(list, ExportHiddenDangerVO.class), "隐患管理表");
   }
 
+  /**
+   * 获取整改负责人和属地负责人集合
+   * @return R
+   */
+  @GetMapping("/users/{roleCode}")
+  public R producer(@PathVariable String roleCode) {
+    SysUserDTO sysUserDTO = new SysUserDTO();
+    sysUserDTO.setRoleCode(roleCode);
+    return new R<>(sysUserService.getUserByRoleOrDept(sysUserDTO));
+  }
+
 }

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserDeptController.java

@@ -71,6 +71,7 @@ public class SysUserDeptController {
     public R producer() {
         return new R<>(sysUserService.getProducers());
     }
+
     /**
      * 查询用户列表
      *

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

@@ -568,6 +568,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             statusRemark = "维修挂起";
             form.setStatus(RepairApplicationFormStatusEnum.HANG_UP.getValue());
             form.setHangUpReason(model.getRemark());
+            form.setDispatchUserId(existForm.getDispatchUserId());
         }
         repairApplicationFormMapper.updateLongYan(form);
         // 添加状态记录
@@ -653,6 +654,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         model.setApplyTime(form.getApplyTime());
         model.setActualUser(form.getActualUser());
         model.setContent(form.getContent());
+        model.setRepairUserName(sysUserMapper.selectUserNameById(model.getRepairUserId()));
         // 添加维修记录
         addRepairRecord(model);
         // 给维修人发送消息
@@ -677,6 +679,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         // 通知生产审核
         List<SysUser> users = ListUtils.newArrayList();
         users.add(sysUserService.getModelById(model.getProduceVerifyUserId()));
+        model.setNo(form.getNo());
         sendMessageToProducer(model,CommonConstants.SB_APPLY_BIG_REPAIR,users);
     }
 
@@ -1051,7 +1054,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         String detailUrl = "pages/service-detail/service-detail?id=" + model.getId(); // 微信跳转url
         switch (type){
             case CommonConstants.SB_APPLY_BIG_REPAIR:
-                messageInfo = MessageTemplateUtil.getRepairStart(model.getNo());
+                messageInfo = MessageTemplateUtil.getBigRepairVerify(model.getNo());
                 values = new String[]{"转大修审核!",model.getNo(),"待审核",DateUtils.dateToString(LocalDateTime.now()),"请知悉"};
                 break;
         }

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -2297,6 +2297,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
             mapper.insertListforComplex(addList);
             return "总计导入：" + (addList.size());
         } catch (Exception e) {
+            e.printStackTrace();
             throw new BusinessException(e.getMessage());
         }
     }

platform-service/src/main/java/com/platform/service/upms/SysUserService.java

@@ -227,4 +227,11 @@ public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
      * @return
      */
     List<SysUserVO> getProducers();
+
+    /**
+     * 根据部门或者角色获取用户集合
+     * @param model
+     * @return
+     */
+    List<SysUserVO> getUserByRoleOrDept(SysUserDTO model);
 }

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

@@ -832,4 +832,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
         sysUserDTO.setRoleCode(SysRoleCodeEnum.PRODUCE_VERIFY_USERS.name());
         return mapper.getRepairUsers(sysUserDTO);
     }
+
+    @Override
+    public List<SysUserVO> getUserByRoleOrDept(SysUserDTO model) {
+        return mapper.getRepairUsers(model);
+    }
 }