From cc59b65bc63b839127c29775bcd410dd407de66d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 21 四月 2025 17:20:02 +0800
Subject: [PATCH] 设备采购计划与设备照片
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
index b841ffc..88389b9 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
@@ -51,7 +51,8 @@
LambdaQueryWrapper<DeviceManufacturer> wrapper = Wrappers.lambdaQuery();
wrapper.like(StrUtil.isNotBlank(deviceManufacturer.getManufacturerCategory()),DeviceManufacturer::getManufacturerCategory,deviceManufacturer.getManufacturerCategory());
wrapper.like(StrUtil.isNotBlank(deviceManufacturer.getManufacturerName()),DeviceManufacturer::getManufacturerName,deviceManufacturer.getManufacturerName());
- return R.ok(deviceManufacturerService.page(page, wrapper));
+ wrapper.orderByDesc(DeviceManufacturer::getCreateTime);
+ return R.ok(deviceManufacturerService.page(page, wrapper));
}
@@ -119,4 +120,13 @@
public List<DeviceManufacturer> export(DeviceManufacturer deviceManufacturer,Long[] ids) {
return deviceManufacturerService.list(Wrappers.lambdaQuery(deviceManufacturer).in(ArrayUtil.isNotEmpty(ids), DeviceManufacturer::getId, ids));
}
+
+ /**
+ * 鑾峰彇涓嬫媺鍒楄〃
+ * @return
+ */
+ @GetMapping("/getDropdownnList")
+ public R<List<DeviceManufacturer>> getDropdownnList() {
+ return R.ok(deviceManufacturerService.list());
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1