From 26e4db19959fdbb5847fda609f0bd0444b84cd5b 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: Sat, 21 Dec 2024 16:26:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=9D=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 --- .../contraller/MaintenanceController.java | 31 +++++++++++++------ 1 file changed, 22 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 94e15e5..cf3f588 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java @@ -20,11 +20,10 @@ import org.springblade.modules.business.pojo.entity.MaintenanceTaskDetailGoods; import org.springblade.modules.business.pojo.entity.maintenance.MaintenancePlan; import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTask; import org.springblade.modules.business.pojo.entity.maintenance.MaintenanceTaskDetail; -import org.springblade.modules.business.service.IMaintenanceApplyGoodsService; -import org.springblade.modules.business.service.IMaintenancePlanService; -import org.springblade.modules.business.service.IMaintenanceTaskDetailService; -import org.springblade.modules.business.service.IMaintenanceTaskService; +import org.springblade.modules.business.service.*; import org.springblade.modules.business.sms.SmsService; +import org.springblade.modules.system.pojo.entity.User; +import org.springblade.modules.system.service.IUserService; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -50,6 +49,8 @@ public class MaintenanceController extends BladeController { private final IMaintenanceTaskDetailService taskDetailService; private final IMaintenanceApplyGoodsService maintenanceApplyGoodsService; private final SmsService smsService; + private final IMessageService messageService; + private final IUserService userService; /*---------- 维修计划开始 ----------*/ @@ -136,7 +137,7 @@ public class MaintenanceController extends BladeController { taskOld.setServicemanName(task.getServicemanName()); taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SUPERVISOR_CONFIRM.getValue()); taskService.updateById(taskOld); - smsService.sendSms("17852327323", "靳娜"); + smsService.sendSms("15053473693", "张迪"); return R.success(); } @@ -186,7 +187,10 @@ public class MaintenanceController extends BladeController { taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SERVICEMAN_SUBMIT.getValue()); taskOld.setFinishTime(DateUtil.now()); taskService.updateById(taskOld); - + List deptPersonList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, task.getDeptId())); + for (User deptPerson : deptPersonList) { + messageService.saveMessage(task.getTaskCode(), "维修已完成,请确认", deptPerson.getId(), 1); + } return R.success(); } @@ -276,6 +280,9 @@ 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); return R.success(); } @@ -285,7 +292,10 @@ public class MaintenanceController extends BladeController { MaintenanceTask taskOld = taskService.getById(task.getId()); taskOld.setRepairStatus(MaintenanceStatusEnum.REPAIR_SUPERVISOR_CONFIRM.getValue()); taskService.updateById(taskOld); - + List userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, task.getDeptId())); + for (User user : userList) { + messageService.saveMessage(task.getTaskCode(), "维修方案已提交,请确认", user.getId(), 1); + } return R.success(); } @@ -300,7 +310,7 @@ public class MaintenanceController extends BladeController { taskOld.setApproveRemark(task.getApproveRemark()); taskOld.setRepairStatus(MaintenanceStatusEnum.SUPERVISOR_CONFIRM_REFUSE.getValue()); taskService.updateById(taskOld); - + messageService.saveMessage(task.getTaskCode(), "维修方案已被驳回,请重新提交维修方案", task.getServicemanId(), 1); return R.success(); } @@ -337,7 +347,10 @@ public class MaintenanceController extends BladeController { taskOld.setApproveRemark(task.getApproveRemark()); taskOld.setRepairStatus(MaintenanceStatusEnum.CUSTOMER_CONFIRM_REFUSE.getValue()); taskService.updateById(taskOld); - + //发送消息 + String role = "1847220301770326017"; + User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); + messageService.saveMessage(task.getTaskCode(), "维修方案已被客户驳回,请重新审批", user.getId(), 1); return R.success(); }