From 3d22d94f396f192da60a1ae73786d7d9cfc60ab2 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: Fri, 20 Dec 2024 16:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=B5=81=E7=A8=8B=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=B6=88=E6=81=AF=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/contraller/WorkOrderController.java | 10 +++++++--- .../business/service/impl/WorkOrderServiceImpl.java | 9 +++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) 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 66dea1f..bca7288 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -300,7 +300,7 @@ public class WorkOrderController extends BladeController { WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, DateUtil.now(), workOrder.getApproveRemark()); approvalService.save(approval); - + messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交,请确认", workOrder.getInformant(), 2); return R.success(""); } @@ -332,7 +332,7 @@ public class WorkOrderController extends BladeController { WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, DateUtil.now(), workOrder.getApproveRemark()); approvalService.save(approval); - + messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已通过,请尽快维修", workOrder.getRepairPerson(), 2); // todo 审核通过 return R.success(""); @@ -355,6 +355,9 @@ 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); // todo 审核通过 return R.success(""); @@ -370,6 +373,7 @@ public class WorkOrderController extends BladeController { workOrderOld.setCloseReason(workOrder.getCloseReason()); workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue()); workOrderService.updateById(workOrderOld); + messageService.saveMessage(workOrder.getRequirementCode(), "维修已完成,请确认是否解决", workOrder.getInformant(), 2); // todo 审核通过 @@ -404,7 +408,7 @@ public class WorkOrderController extends BladeController { WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark()); approvalService.save(approval); - + messageService.saveMessage(workOrder.getRequirementCode(), "客户认为维修未完成,请尽快再次解决", workOrder.getRepairPerson(), 2); // todo 审核通过 return R.success(""); 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 9074e71..a81af0f 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 @@ -266,6 +266,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl videoAttaches, List picAttaches, Long orderId) {