From 1eb6f4824c270de1a3d0bf766d44f1abb2c7f55d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 24 四月 2025 17:30:07 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单字段 及 生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java
index 4d1beab..fc909c6 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java
@@ -52,6 +52,7 @@
wrapper.like(StrUtil.isNotBlank(workOrder.getWoCode()),WorkOrder::getWoCode,workOrder.getWoCode());
wrapper.like(StrUtil.isNotBlank(workOrder.getWoDesc()),WorkOrder::getWoDesc,workOrder.getWoDesc());
wrapper.eq(Objects.nonNull(workOrder.getWoStatus()),WorkOrder::getWoStatus,workOrder.getWoStatus());
+ wrapper.orderByDesc(WorkOrder::getCreateTime);
return R.ok(workOrderService.page(page, wrapper));
}
@@ -78,7 +79,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('device_workOrder_add')" )
public R save(@RequestBody WorkOrder workOrder) {
- return R.ok(workOrderService.save(workOrder));
+ return workOrderService.saveNew(workOrder);
}
/**
@@ -91,7 +92,7 @@
@PutMapping
@PreAuthorize("@pms.hasPermission('device_workOrder_edit')" )
public R updateById(@RequestBody WorkOrder workOrder) {
- return R.ok(workOrderService.updateById(workOrder));
+ return workOrderService.updateByIdNew(workOrder);
}
/**
--
Gitblit v1.9.1