计划维修

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

@@ -462,4 +462,5 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      * 计划结束时间
      */
     private LocalDateTime planEndTime;
+
 }

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

@@ -132,7 +132,7 @@ public enum SysRoleCodeEnum {
      * 计划性维修
      * 生产审核
      */
-    VERIFY_REPAIR,
+    PRODUCE_VERIFY_USERS,
     /**
      * 报修派工角色
      */

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

@@ -62,6 +62,15 @@ public class SysUserDeptController {
     public R repairManger() {
         return new R<>(sysUserService.getRepairManger());
     }
+
+    /**
+     * 查询生产审核用户列表
+     * @return R
+     */
+    @GetMapping("/producer")
+    public R producer() {
+        return new R<>(sysUserService.getRepairManger());
+    }
     /**
      * 查询用户列表
      *

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

@@ -518,25 +518,22 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         if(!roles.contains(SysRoleCodeEnum.MM.name())){
             throw new DeniedException("对不起，您不具有审核权限");
         }
-        String produceUser = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.PRODUCE_VERIFY_USERS.name());
-        if(StringUtils.isBlank(produceUser)){
-            throw new DeniedException("生产审核人员为空，请先配置！");
+        if(StringUtils.isBlank(model.getProduceVerifyUserId())){
+            throw new DeniedException("请选择生产审核人员！");
         }
         RepairApplicationForm form = repairApplicationFormMapper.selectById(model.getId());
         // 修改工单状态
         RepairApplicationForm updForm = new RepairApplicationForm();
         updForm.setId(form.getId());
         updForm.setStatus(RepairApplicationFormStatusEnum.CALLER_REPAIR_VERIFYING_THREE.getValue());
+        updForm.setProduceVerifyUserId(model.getProduceVerifyUserId());
         repairApplicationFormMapper.updateByPrimaryKeySelective(updForm);
         // 添加跟踪状态
         addRepairStatusRecord(form,"经理审核");
         // 添加审核记录
         addRepairVerifyRecord(model,CommonConstants.STATUS_VERIFY_PASS, CommonConstants.TYPE_PLAN_MM_VERIFY);
-        List<String> userNames = JSONArray.parseArray(produceUser,String.class);
         List<SysUser> users = ListUtils.newArrayList();
-        userNames.forEach(item -> {
-            users.add(sysUserService.selectByUsername(item));
-        });
+        users.add(sysUserService.getModelById(model.getProduceVerifyUserId()));
         // 通知生产审核
         sendMessageToProducer(model,CommonConstants.SB_CALL_REPAIR,users);
     }

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

@@ -221,4 +221,10 @@ public interface SysUserService extends IBaseService<SysUser, SysUserDTO> {
     List<SysUserVO> getRepairUsers(SysUserDTO sysUserDTO);
 
     List<SysUserVO> getRepairManger();
+
+    /**
+     * 获取生产审核列表
+     * @return
+     */
+    List<SysUserVO> getProducers();
 }

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

@@ -825,4 +825,11 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser,
         sysUserDTO.setRoleCode(SysRoleCodeEnum.REPAIR_MANAGE.name());
         return mapper.getRepairUsers(sysUserDTO);
     }
+
+    @Override
+    public List<SysUserVO> getProducers() {
+        SysUserDTO sysUserDTO = new SysUserDTO();
+        sysUserDTO.setRoleCode(SysRoleCodeEnum.PRODUCE_VERIFY_USERS.name());
+        return mapper.getRepairUsers(sysUserDTO);
+    }
 }