diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java index 055f830..d5285ad 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/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)); - messageService.saveMessage(task.getTaskCode(), "维修方案已提交,请进行审核", user.getId(), 1); + List list = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); + for (User user : list) { + messageService.saveMessage(task.getTaskCode(), "维修方案已提交,请进行审核", user.getId(), 1); + } return R.success(); } diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java index 7cefbb6..5ffe623 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/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)); - messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回,请重新修改", user.getId(), 2); + List list = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); + for (User user : list) { + messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回,请重新修改", user.getId(), 2); + } // todo 审核通过 //保存日志 LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName()); diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java index 5682b9d..0f5235d 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java @@ -278,11 +278,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl list = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); + for (User user : list) { + if (workOrder.getRepairType() == 1) { + messageService.saveMessage(workOrder.getRequirementCode(), "维修方案及物料相关已补交,请评价", workOrder.getInformant(), 2); + } else { + messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交,请评价", user.getId(), 2); + } } } this.updateById(workOrderOld);