From 80b665d68a5c6b20e22d2ef85ab1f4fba7b3b2e0 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: Wed, 18 Dec 2024 14:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=B8=BB=E7=AE=A1=E6=8C=87?= =?UTF-8?q?=E6=B4=BE=E7=BB=B4=E4=BF=AE=E4=BA=BA=E5=91=98=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=9F=AD=E4=BF=A1=E7=BB=99=E7=BB=B4=E4=BF=AE=E4=BA=BA?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contraller/MaintenanceController.java | 22 +++++++++++-------- .../service/impl/WorkOrderServiceImpl.java | 4 ++++ .../modules/business/sms/SmsService.java | 1 + 3 files changed, 18 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 3ce82c3..caceedc 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java @@ -23,6 +23,7 @@ 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.sms.SmsService; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; @@ -45,6 +46,8 @@ public class MaintenanceController extends BladeController { private final IMaintenanceTaskService taskService; private final IMaintenanceTaskDetailService taskDetailService; + private final SmsService smsService; + /*---------- 维修计划开始 ----------*/ @GetMapping("/plan-page") @@ -89,14 +92,14 @@ public class MaintenanceController extends BladeController { /*---------- 维修任务开始 ----------*/ - @PostMapping("/task-create") - @Operation(summary = "定时任务-根据维保计划生成维保任务", description = "定时任务-根据维保计划生成维保任务") - public R taskCreate() { - // 提前五天生成 - LocalDate now = LocalDate.now().minusDays(-5); - // 注意要查询上一次巡检计划中发现但未维修的 - return R.status(planService.createTask(now)); - } + @PostMapping("/task-create") + @Operation(summary = "定时任务-根据维保计划生成维保任务", description = "定时任务-根据维保计划生成维保任务") + public R taskCreate() { + // 提前五天生成 + LocalDate now = LocalDate.now().minusDays(-5); + // 注意要查询上一次巡检计划中发现但未维修的 + return R.status(planService.createTask(now)); + } @GetMapping("/task-page") @Operation(summary = "维保任务列表", description = "维保任务列表") @@ -123,13 +126,14 @@ public class MaintenanceController extends BladeController { @PostMapping("/task-supervisor-confirm") @Operation(summary = "主管审核并指定维修人员", description = "主管审核并指定维修人员") + @Transactional(rollbackFor = Exception.class) public R taskSupervisorConfirm(@RequestBody MaintenanceTask task) throws ClientException { MaintenanceTask taskOld = taskService.getById(task.getId()); taskOld.setServicemanId(task.getServicemanId()); taskOld.setServicemanName(task.getServicemanName()); taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_SUPERVISOR_CONFIRM.getValue()); taskService.updateById(taskOld); - SmsService.sendSms("13553032083", "阿祥"); + smsService.sendSms("17852327323", "靳娜"); 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 389eaab..3f55964 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 @@ -358,6 +358,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl searchMaintenancePersonnel(Long id) { + //获取维修人员列表 User maintenanceSupervisor = userService.getById(id); String deptId = maintenanceSupervisor.getDeptId(); List deptChild = deptService.getDeptChild(Long.parseLong(deptId)); @@ -370,11 +371,14 @@ public class WorkOrderServiceImpl extends BaseServiceImpl maintenancePersonnelList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getDeptId, requiredDept.getId())); List list = new ArrayList<>(); + //查询每个维修人员的工单数量及满意度 for (User user : maintenancePersonnelList) { MaintenancePersonnel maintenancePersonnel = new MaintenancePersonnel(); maintenancePersonnel.setName(user.getName()); + //查询每个维修人员的工单数量 Long count = this.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getRepairPerson, user.getId())); maintenancePersonnel.setCount(count); + //查询每个维修人员的满意度 List workOrderList = this.list(Wrappers.lambdaQuery(WorkOrder.class) .eq(WorkOrder::getRepairPerson, user.getId())); int num = workOrderList.size() * 3; diff --git a/src/main/java/org/springblade/modules/business/sms/SmsService.java b/src/main/java/org/springblade/modules/business/sms/SmsService.java index 0e7ad31..393ff28 100644 --- a/src/main/java/org/springblade/modules/business/sms/SmsService.java +++ b/src/main/java/org/springblade/modules/business/sms/SmsService.java @@ -59,6 +59,7 @@ public class SmsService { System.out.println(String.format("向 手机号：%s 用户发送短信成功！", phoneNumber)); } else { System.out.println(String.format("向 手机号：%s 用户发送短信失败！", phoneNumber)); + throw new RuntimeException(); } } catch (Exception e) { throw new RuntimeException(e);