From 4e2534366dbecf270c18363b3ff13f52a5f3939a Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Thu, 12 Dec 2024 10:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/contraller/WorkOrderController.java | 4 +--- .../modules/business/enums/WorkOrderStatusEnum.java | 10 +++++++--- .../pojo/entity/maintenance/MaintenanceTask.java | 10 ++++++++++ 3 files changed, 18 insertions(+), 6 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 a3afc40..6ef9f06 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -395,11 +395,9 @@ public class WorkOrderController extends BladeController { public R serviceClose(@RequestBody WorkOrder workOrder) { WorkOrder workOrderOld = workOrderService.getById(workOrder.getId()); workOrderOld.setCloseReason(workOrder.getCloseReason()); - workOrderOld.setStatus(WorkOrderStatusEnum.CLOSE.getValue()); + workOrderOld.setStatus(WorkOrderStatusEnum.SERVICE_CLOSE.getValue()); workOrderService.updateById(workOrderOld); - // todo, 调用流程，审批通过 - return R.success(""); } diff --git a/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java b/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java index 07d1502..e3d6951 100644 --- a/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java +++ b/src/main/java/org/springblade/modules/business/enums/WorkOrderStatusEnum.java @@ -20,17 +20,21 @@ public enum WorkOrderStatusEnum { * 客户提交 待客服处理 */ CUSTOMER_SUBMIT(0), - /** - * 维修人员拒绝， 待客服处理 + * 客服沟通后关闭工单 */ - SERVICE_REFUSE(100), + SERVICE_CLOSE(20), /** * 客服分配维修人员，待维修人员确认 */ SERVICE_SUBMIT(1), + /** + * 维修人员拒绝， 待客服处理 + */ + SERVICE_REFUSE(100), + /** * 维修人员确认，，待提交维修方案 */ diff --git a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java index fec2351..2649701 100644 --- a/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java +++ b/src/main/java/org/springblade/modules/business/pojo/entity/maintenance/MaintenanceTask.java @@ -172,6 +172,16 @@ public class MaintenanceTask extends BaseEntity { */ private Date signatureTime; + /** + * 签字图片地址 + */ + private String signUrl; + + /** + * 备注 + */ + private String remark; + /** * 计划详情 */