From 830fe282e2438c8a2da2d22d4b787e8721fecf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?= <14281818+xue-hongxiang@user.noreply.gitee.com> Date: Mon, 23 Dec 2024 14:07:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E7=BB=B4=E4=BF=AE=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF=E5=BC=80=E5=8F=91?= =?UTF-8?q?+=E7=BB=B4=E4=BF=9D=E6=B5=81=E7=A8=8B=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/contraller/MaintenanceController.java | 7 +++++-- .../business/contraller/WorkOrderController.java | 7 +++++-- .../business/service/impl/WorkOrderServiceImpl.java | 12 +++++++----- 3 files changed, 17 insertions(+), 9 deletions(-) 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);