|
|
|
|
@ -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(""); |
|
|
|
|
|