From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 23 四月 2025 17:30:52 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
index e0ab86d..7b858d5 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
@@ -54,8 +54,9 @@
@PreAuthorize("@pms.hasPermission('platformx_purchaseTendrOrder_view')" )
public R getPurchaseTendrOrderPage(@ParameterObject Page page, @ParameterObject PurchaseTendrOrderEntity purchaseTendrOrder) {
LambdaQueryWrapper<PurchaseTendrOrderEntity> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getOrderName()),PurchaseTendrOrderEntity::getOrderName,purchaseTendrOrder.getOrderName());
wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getPurchasePlanCode()),PurchaseTendrOrderEntity::getPurchasePlanCode,purchaseTendrOrder.getPurchasePlanCode());
- wrapper.orderBy(true,false, PurchaseTendrOrderEntity::getCreateTime);
+ wrapper.orderByDesc(PurchaseTendrOrderEntity::getCreateTime);
return R.ok(purchaseTendrOrderService.page(page, wrapper));
}
@@ -127,8 +128,21 @@
}
/**
- * 閫氳繃id鍒犻櫎鎷涙爣閲囪喘鍗�
- * @param ids id鍒楄〃
+ * 閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�
+ * @param id id鍒楄〃
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�" , description = "閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�" )
+ @SysLog("閫氳繃id瀹℃牳鎷涙爣閲囪喘鍗�" )
+ @GetMapping("/approved/{id}")
+ @PreAuthorize("@pms.hasPermission('platformx_purchaseTendrOrder_approved')" )
+ public R approved(@PathVariable("id")Long id) {
+ return R.ok(purchaseTendrOrderService.approved(id));
+ }
+
+ /**
+ * 閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�
+ * @param id鍒楄〃
* @return R
*/
@Operation(summary = "閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�" , description = "閫氳繃id瀹屾垚鎷涙爣閲囪喘鍗�" )
--
Gitblit v1.9.1