From ffbddedac17c4a7d18d382c4917b3f375356e061 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 01 四月 2025 10:23:47 +0800
Subject: [PATCH] 整体流程测试修改0401-1
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
index 0994dce..3f4dadc 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java
@@ -15,6 +15,7 @@
import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.Device;
import com.by4cloud.platformx.device.entity.DeviceInventory;
+import com.by4cloud.platformx.device.entity.InvestmentPlan;
import com.by4cloud.platformx.device.service.DeviceInventoryService;
import com.by4cloud.platformx.device.service.DeviceService;
import com.by4cloud.platformx.device.service.JcMaxSizeService;
@@ -62,6 +63,7 @@
wrapper.eq(Device::getReqStatus,1);
wrapper.like(StrUtil.isNotBlank(device.getNumber()),Device::getNumber,device.getNumber());
wrapper.like(StrUtil.isNotBlank(device.getName()),Device::getName,device.getName());
+ wrapper.orderByDesc(Device::getCreateTime);
Page<Device> page1 = deviceService.page(page, wrapper);
for (Device device1 : page1.getRecords()) {
QueryWrapper<DeviceInventory> wrapper1 = new QueryWrapper<>();
@@ -210,4 +212,13 @@
public List<Device> export(Device device,Long[] ids) {
return deviceService.list(Wrappers.lambdaQuery(device).in(ArrayUtil.isNotEmpty(ids), Device::getId, ids));
}
+
+ /**
+ * 鎵�鏈夎澶囦笅鎷�
+ * @return
+ */
+ @GetMapping("/getDropdowmList" )
+ public R getDeviceList() {
+ return R.ok(deviceService.list());
+ }
}
--
Gitblit v1.9.1