紧急维修流程通知消息开发+维保流程消息通知完善

src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java

@@ -284,9 +284,12 @@ public class MaintenanceController extends BladeController {
         MaintenanceTask taskOld = taskService.getById(task.getId());
         taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SERVICEMAN_SUBMIT.getValue());
         taskService.updateById(taskOld);
+        //发送消息
         String role = "1839537055389515777";
-        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        List<User> list = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
-        messageService.saveMessage(task.getTaskCode(), "维修方案已提交，请进行审核", user.getId(), 1);
+        for (User user : list) {
+            messageService.saveMessage(task.getTaskCode(), "维修方案已提交，请进行审核", user.getId(), 1);
+        }
         return R.success();
     }
 

src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java

@@ -378,9 +378,12 @@ public class WorkOrderController extends BladeController {
 
         WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark());
         approvalService.save(approval);
+        //发送消息
         String role = "1839537055389515777";
-        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        List<User> list = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
-        messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回，请重新修改", user.getId(), 2);
+        for (User user : list) {
+            messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回，请重新修改", user.getId(), 2);
+        }
         // todo 审核通过
         //保存日志
         LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName());

src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@@ -278,11 +278,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_REPAIR_PLAN_SUBMIT.getName());
             //发送消息给主管
             String role = "1839537055389515777";
-            User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+            List<User> list = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
-            if (workOrder.getRepairType() == 1) {
+            for (User user : list) {
-                messageService.saveMessage(workOrder.getRequirementCode(), "维修方案及物料相关已补交，请评价", user.getId(), 2);
+                if (workOrder.getRepairType() == 1) {
-            } else {
+                    messageService.saveMessage(workOrder.getRequirementCode(), "维修方案及物料相关已补交，请评价", workOrder.getInformant(), 2);
-                messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请审批", user.getId(), 2);
+                } else {
+                    messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请评价", user.getId(), 2);
+                }
             }
         }
         this.updateById(workOrderOld);