From dd4342dd35de39cab1ff76a349fd72043e066abd 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 14:28:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/contraller/WorkOrderController.java | 12 ++++++++++-- .../modules/business/pojo/entity/Message.java | 3 +++ .../modules/business/service/IMessageService.java | 2 +- .../business/service/impl/MessageServiceImpl.java | 1 + .../business/service/impl/WorkOrderServiceImpl.java | 2 +- 5 files changed, 16 insertions(+), 4 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 4405e15..66dea1f 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -27,6 +27,8 @@ import org.springblade.modules.business.service.IWorkOrderApprovalService; import org.springblade.modules.business.service.IWorkOrderFlowService; import org.springblade.modules.business.service.IWorkOrderService; import org.springblade.modules.system.pojo.entity.Dept; +import org.springblade.modules.system.pojo.entity.User; +import org.springblade.modules.system.service.IUserService; import org.springframework.web.bind.annotation.*; import java.io.BufferedReader; @@ -57,6 +59,10 @@ public class WorkOrderController extends BladeController { private final IWorkOrderFlowService flowService; + private final IUserService userService; + + private final IMessageService messageService; + /** * 查询工作订单列表 @@ -172,7 +178,6 @@ public class WorkOrderController extends BladeController { @ApiLog(value = "提报管理-保存工单并提交") @PostMapping("/customer-save") public R customerSave(@RequestBody List workOrder) { - ; return R.status(workOrderService.saveAndSubmit(workOrder)); } @@ -226,6 +231,8 @@ public class WorkOrderController extends BladeController { workOrderOld.setCustomerOpinion(workOrder.getCustomerOpinion()); workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_ALLOT.getValue()); workOrderService.updateById(workOrderOld); + User repairPerson = userService.getById(workOrder.getRepairPerson()); + messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单，请尽快处理", repairPerson.getId(), 2); // todo 审核通过 return R.success(""); @@ -413,7 +420,8 @@ public class WorkOrderController extends BladeController { workOrderOld.setCloseReason(workOrder.getCloseReason()); workOrderOld.setStatus(WorkOrderStatusEnum.KF_REPAIR_FINISH.getValue()); workOrderService.updateById(workOrderOld); - + User customer = userService.getById(workOrder.getInformant()); + messageService.saveMessage(workOrder.getRequirementCode(), "请注意维修单评价", customer.getId(), 2); return R.success(""); } diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/Message.java b/src/main/java/org/springblade/modules/business/pojo/entity/Message.java index 67a57b0..26e61b0 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/Message.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/Message.java @@ -37,4 +37,7 @@ public class Message extends BaseEntity { private Long messageUser; + //需求单号 + private String requirementCode; + } diff --git a/src/main/java/org/springblade/modules/business/service/IMessageService.java b/src/main/java/org/springblade/modules/business/service/IMessageService.java index 2d18ccd..e3bea40 100644 --- a/src/main/java/org/springblade/modules/business/service/IMessageService.java +++ b/src/main/java/org/springblade/modules/business/service/IMessageService.java @@ -11,7 +11,7 @@ import java.util.List; public interface IMessageService extends BaseService { - void saveMessage(String title, String content, Long messageUser, Integer messageType); + void saveMessage(String requirementCode, String content, Long messageUser, Integer messageType); PageVO getMessageList(Integer current, Integer size, LocalDate start, LocalDate end, Integer status); diff --git a/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java index 6f9c205..c66f805 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/MessageServiceImpl.java @@ -30,6 +30,7 @@ public class MessageServiceImpl extends BaseServiceImpl @Override public void saveMessage(String requirementCode, String content, Long messageUser, Integer messageType) { Message saveInformation = new Message(); + saveInformation.setRequirementCode(requirementCode); saveInformation.setSystemType("1"); saveInformation.setTitle("需求单"); saveInformation.setContent(content); 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 4f6c57f..9074e71 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 @@ -133,7 +133,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl