From 29db6bcf635ed6440cd320c24baafc9839232e72 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 11:49:53 +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 --- .../contraller/MaintenanceController.java | 5 +- .../contraller/WorkOrderController.java | 270 +++++++++--------- .../pojo/entity/workorder/WorkOrder.java | 7 +- .../service/impl/WorkOrderServiceImpl.java | 17 +- 4 files changed, 156 insertions(+), 143 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 48ff20f..055f830 100644 --- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java +++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java @@ -201,7 +201,10 @@ public class MaintenanceController extends BladeController { MaintenanceTask taskOld = taskService.getById(task.getId()); taskOld.setTaskStatus(MaintenanceStatusEnum.TASK_CUSTOMER_CONFIRM.getValue()); taskService.updateById(taskOld); - + //发送消息 + String role = "1839536982874193922"; + User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); + 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 dbdd4a6..7cefbb6 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -241,29 +241,29 @@ public class WorkOrderController extends BladeController { messageService.saveMessage(workOrder.getRequirementCode(), "您已接收新的维修单，请尽快处理", workOrder.getRepairPerson(), 2); } // todo 审核通过 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_ALLOT.getName()); + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_ALLOT.getName()); return R.success(""); } - /** - * 维修人员接收工单 - */ - @ApiLog(value = "提报管理-维修人员接收工单") - @PostMapping("/serviceman-receive") - public R serviceReceive(@RequestBody WorkOrder workOrder) { - WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); - workOrderOld.setReceiveOrderTime(DateUtil.now()); - if(workOrderOld.getRepairType().equals(1)){ - workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getValue()); - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName()); - }else{ - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_ORDER_ACCEPT.getName()); - workOrderOld.setStatus(WorkOrderStatusEnum.WX_ORDER_ACCEPT.getValue()); - } - - workOrderService.updateById(workOrderOld); + /** + * 维修人员接收工单 + */ + @ApiLog(value = "提报管理-维修人员接收工单") + @PostMapping("/serviceman-receive") + public R serviceReceive(@RequestBody WorkOrder workOrder) { + WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); + workOrderOld.setReceiveOrderTime(DateUtil.now()); + if (workOrderOld.getRepairType().equals(1)) { + workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getValue()); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName()); + } else { + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_ORDER_ACCEPT.getName()); + workOrderOld.setStatus(WorkOrderStatusEnum.WX_ORDER_ACCEPT.getValue()); + } + + workOrderService.updateById(workOrderOld); // todo 审核通过 @@ -284,9 +284,9 @@ public class WorkOrderController extends BladeController { WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getRepaiRejectReason()); approvalService.save(approval); // todo 审核拒绝 - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_ORDER_REFUSE.getName()); - return R.success(""); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_ORDER_REFUSE.getName()); + return R.success(""); } /** @@ -317,12 +317,12 @@ 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); + messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已提交，请确认", workOrder.getInformant(), 2); - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.ZG_REPAIR_PLAN_PASS.getName()); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.ZG_REPAIR_PLAN_PASS.getName()); - return R.success(""); + return R.success(""); } /** @@ -355,10 +355,10 @@ public class WorkOrderController extends BladeController { approvalService.save(approval); messageService.saveMessage(workOrder.getRequirementCode(), "维修方案已通过，请尽快维修", workOrder.getRepairPerson(), 2); // todo 审核通过 - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_PLAN_PASS.getName()); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_PASS.getName()); - return R.success(""); + return R.success(""); } /** @@ -382,31 +382,31 @@ public class WorkOrderController extends BladeController { User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role)); messageService.saveMessage(workOrder.getRequirementCode(), "审批方案已驳回，请重新修改", user.getId(), 2); // todo 审核通过 - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName()); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_PLAN_REFUSE.getName()); - return R.success(""); + return R.success(""); } - /** - * 维修人员提交维修结果 - */ - @ApiLog(value = "提报管理-维修人员提交维修结果") - @PostMapping("/serviceman-repair-submit") - public R servicemanRepairSubmit(@RequestBody WorkOrder workOrder) { - WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); - workOrderOld.setCloseReason(workOrder.getCloseReason()); - if(workOrderOld.getRepairType().equals(1)){ - workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getValue()); - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getName()); - }else{ - workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue()); - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_REPAIR_FINISH.getName()); - } - workOrderService.updateById(workOrderOld); - messageService.saveMessage(workOrder.getRequirementCode(), "维修已完成，请确认是否解决", workOrder.getInformant(), 2); + /** + * 维修人员提交维修结果 + */ + @ApiLog(value = "提报管理-维修人员提交维修结果") + @PostMapping("/serviceman-repair-submit") + public R servicemanRepairSubmit(@RequestBody WorkOrder workOrder) { + WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); + workOrderOld.setCloseReason(workOrder.getCloseReason()); + if (workOrderOld.getRepairType().equals(1)) { + workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getValue()); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_REPAIR_FINISH.getName()); + } else { + workOrderOld.setStatus(WorkOrderStatusEnum.WX_REPAIR_FINISH.getValue()); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_REPAIR_FINISH.getName()); + } + workOrderService.updateById(workOrderOld); + messageService.saveMessage(workOrder.getRequirementCode(), "维修已完成，请确认是否解决", workOrder.getInformant(), 2); // todo 审核通过 @@ -441,12 +441,13 @@ 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 审核通过 - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),"维修完成，客户审核未通过"); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), "维修完成，客户审核未通过"); - return R.success(""); + return R.success(""); } /** @@ -460,8 +461,8 @@ public class WorkOrderController extends BladeController { workOrderOld.setStatus(WorkOrderStatusEnum.KF_REPAIR_FINISH.getValue()); workOrderService.updateById(workOrderOld); User customer = userService.getById(workOrder.getInformant()); - messageService.saveMessage(workOrder.getRequirementCode(), "请注意维修单评价", customer.getId(), 2); - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_REPAIR_FINISH.getName()); + messageService.saveMessage(workOrder.getRequirementCode(), "请注意维修单评价", customer.getId(), 2); + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_REPAIR_FINISH.getName()); return R.success(""); } @@ -475,9 +476,9 @@ public class WorkOrderController extends BladeController { workOrderOld.setCloseReason(workOrder.getCloseReason()); workOrderOld.setStatus(WorkOrderStatusEnum.KF_ORDER_CLOSE.getValue()); workOrderService.updateById(workOrderOld); - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KF_ORDER_CLOSE.getName()); - return R.success(""); + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KF_ORDER_CLOSE.getName()); + return R.success(""); } /** @@ -542,76 +543,81 @@ public class WorkOrderController extends BladeController { URLConnection httpConnection = url.openConnection(); httpConnection.connect(); - InputStreamReader isr = new InputStreamReader(httpConnection.getInputStream()); - BufferedReader reader = new BufferedReader(isr); - StringBuffer buffer = new StringBuffer(); - String line; - while ((line = reader.readLine()) != null) { - buffer.append(line); - } - reader.close(); - isr.close(); - return buffer.toString(); - } - - /** - * 根据设备id查询工作订单列表 - * - * @return 返回工作订单列表的响应对象 - */ - @GetMapping("/find-list-by-device-id") - public R> findListByDeviceId(Long deviceId) { - List list = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getDeviceId,deviceId).eq(BaseEntity::getIsDeleted,0)); - return R.data(list); - } - - /** - * 评价签字 - */ - @ApiLog(value = "提报管理-紧急维修客户确认维修效果") - @PostMapping("/customer-emergency-repair-confirm") - public R customerEmergencyRepairConfirm(@RequestBody WorkOrder workOrder) { - WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); - workOrderOld.setApprovePoint("客户审批维修结果"); - workOrderOld.setApprovePerson(workOrder.getApprovePerson()); - workOrderOld.setApproveResult(workOrder.getApproveResult()); - workOrderOld.setApproveTime(workOrder.getApproveTime()); - workOrderOld.setApproveRemark(workOrder.getApproveRemark()); - workOrderOld.setStatus(WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getValue()); - workOrderService.updateById(workOrderOld); - - WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, DateUtil.now(), workOrder.getApproveRemark()); - approvalService.save(approval); - - // todo 审核通过 - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getName()); - - return R.success(""); - } - - /** - * 紧急维修，客户确认效果驳回 - */ - @ApiLog(value = "提报管理-紧急维修，客户确认效果驳回") - @PostMapping("/customer-emergency-repair-reject") - public R customerEmergencyRepairReject(@RequestBody WorkOrder workOrder) { - WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); - workOrderOld.setApprovePoint("客户审批维修结果"); - workOrderOld.setApprovePerson(workOrder.getApprovePerson()); - workOrderOld.setApproveResult(workOrder.getApproveResult()); - workOrderOld.setApproveTime(workOrder.getApproveTime()); - workOrderOld.setApproveRemark(workOrder.getApproveRemark()); - workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getValue()); - workOrderService.updateById(workOrderOld); - - WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark()); - approvalService.save(approval); - - // todo 审核通过 - //保存日志 - LogUtil.saveLog(workOrderOld.getRequirementCode(),WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName()); - - return R.success(""); - } + InputStreamReader isr = new InputStreamReader(httpConnection.getInputStream()); + BufferedReader reader = new BufferedReader(isr); + StringBuffer buffer = new StringBuffer(); + String line; + while ((line = reader.readLine()) != null) { + buffer.append(line); + } + reader.close(); + isr.close(); + return buffer.toString(); + } + + /** + * 根据设备id查询工作订单列表 + * + * @return 返回工作订单列表的响应对象 + */ + @GetMapping("/find-list-by-device-id") + public R> findListByDeviceId(Long deviceId) { + List list = workOrderService.list(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getDeviceId, deviceId).eq(BaseEntity::getIsDeleted, 0)); + return R.data(list); + } + + /** + * 评价签字 + */ + @ApiLog(value = "提报管理-紧急维修客户确认维修效果") + @PostMapping("/customer-emergency-repair-confirm") + public R customerEmergencyRepairConfirm(@RequestBody WorkOrder workOrder) { + WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); + workOrderOld.setApprovePoint("客户审批维修结果"); + workOrderOld.setApprovePerson(workOrder.getApprovePerson()); + workOrderOld.setApproveResult(workOrder.getApproveResult()); + workOrderOld.setApproveTime(workOrder.getApproveTime()); + workOrderOld.setApproveRemark(workOrder.getApproveRemark()); + workOrderOld.setStatus(WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getValue()); + workOrderService.updateById(workOrderOld); + + WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.TRUE_STR, DateUtil.now(), workOrder.getApproveRemark()); + approvalService.save(approval); + + // todo 审核通过 + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.KH_REPAIR_CONFIRM.getName()); + + //消息发送 + messageService.saveMessage(workOrder.getRequirementCode(), "客户审核维修成果已通过，请尽快补填维修方案和物料相关", workOrder.getRepairPerson(), 2); + return R.success(""); + } + + /** + * 紧急维修，客户确认效果驳回 + */ + @ApiLog(value = "提报管理-紧急维修，客户确认效果驳回") + @PostMapping("/customer-emergency-repair-reject") + public R customerEmergencyRepairReject(@RequestBody WorkOrder workOrder) { + WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); + workOrderOld.setApprovePoint("客户审批维修结果"); + workOrderOld.setApprovePerson(workOrder.getApprovePerson()); + workOrderOld.setApproveResult(workOrder.getApproveResult()); + workOrderOld.setApproveTime(workOrder.getApproveTime()); + workOrderOld.setApproveRemark(workOrder.getApproveRemark()); + workOrderOld.setStatus(WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getValue()); + workOrderService.updateById(workOrderOld); + + WorkOrderApproval approval = new WorkOrderApproval(workOrder.getId(), AuthUtil.getUserId(), CommonConstant.FALSE_STR, DateUtil.now(), workOrder.getApproveRemark()); + approvalService.save(approval); + + // todo 审核通过 + //保存日志 + LogUtil.saveLog(workOrderOld.getRequirementCode(), WorkOrderStatusEnum.WX_EMERGENCY_ORDER_ACCEPT.getName()); + + //消息发送 + messageService.saveMessage(workOrder.getRequirementCode(), "客户对维修成功不满意，请尽快再次维修", workOrder.getRepairPerson(), 2); + + return R.success(""); + } } diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java index 6c34c7b..2107ad6 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/workorder/WorkOrder.java @@ -238,9 +238,8 @@ public class WorkOrder extends BaseEntity { */ private Integer repairType; - /** - * 维修类型 1紧急维修 2故障维修 3改造需求 - */ - private Integer repairType; + /** + * 维修类型 1紧急维修 2故障维修 3改造需求 + */ } 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 d0ef348..5682b9d 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 @@ -151,7 +151,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl