计划维修

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

@@ -163,10 +163,6 @@ public enum SysRoleCodeEnum {
      * 巡检主管
      */
     FILL_CHECKER_LEADER,
-    /**
-     * 设备报修-生产审核
-     */
-    SB_CALLER_VERIFY,
     ;
 
 }

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

@@ -381,7 +381,7 @@ public class MessageTemplateUtil {
     }
 
     public static String getApplyVerify(String id) {
-        return String.format("计划性报修单【%s申请维修，请知悉", id);
+        return String.format("计划性报修单【%s】申请维修，请知悉", id);
     }
 
     public static String getReceive(String id) {

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

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

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

@@ -534,6 +534,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         addRepairVerifyRecord(model,CommonConstants.STATUS_VERIFY_PASS, CommonConstants.TYPE_PLAN_MM_VERIFY);
         List<SysUser> users = ListUtils.newArrayList();
         users.add(sysUserService.getModelById(model.getProduceVerifyUserId()));
+        model.setNo(form.getNo());
         // 通知生产审核
         sendMessageToProducer(model,CommonConstants.SB_CALL_REPAIR,users);
     }
@@ -571,7 +572,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
     public void verifyRepairByProduce(RepairApplicationFormDTO model) {
         // 判断是否具有权限
         String roles = getCurrentRoles();
-        if(!roles.contains(SysRoleCodeEnum.SB_CALLER_VERIFY.name())){
+        if(!roles.contains(SysRoleCodeEnum.PRODUCE_VERIFY_USERS.name())){
             throw new DeniedException("对不起，您不具有审核权限");
         }
         RepairApplicationForm form = repairApplicationFormMapper.selectById(model.getId());
@@ -591,6 +592,11 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         // 添加维修记录
         model.setRepairUserId(form.getRepairUserId());
         model.setRepairUserName(form.getRepairUserName());
+        model.setNo(form.getNo());
+        model.setSbId(form.getSbId());
+        model.setSbCph(form.getSbCph());
+        model.setActualUser(form.getActualUser());
+        model.setContent(form.getContent());
         addRepairRecord(model);
         // 通知维修人可以进行维修
         sendMessageToRepairer(model);
@@ -604,7 +610,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
     public void verifyRefusedByProduce(RepairApplicationFormDTO model) {
         // 判断是否具有权限
         String roles = getCurrentRoles();
-        if(!roles.contains(SysRoleCodeEnum.SB_CALLER_VERIFY.name())){
+        if(!roles.contains(SysRoleCodeEnum.PRODUCE_VERIFY_USERS.name())){
             throw new DeniedException("对不起，您不具有审核权限");
         }
         RepairApplicationForm form = repairApplicationFormMapper.selectById(model.getId());