From 110c67264a45e72b763681bf3d7721e16758c55f Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 31 三月 2025 09:48:46 +0800
Subject: [PATCH] fix: 修改page方法为倒叙
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InvestmentPlanController.java | 1 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java | 1 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java | 2 ++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java | 2 ++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/JcMaxSizeController.java | 2 ++
5 files changed, 8 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..80e083d 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<>();
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
index 3cfa40b..ff907e2 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java
@@ -61,6 +61,7 @@
wrapper.eq(deviceDemandPlan.getDeclareCompId() !=null,DeviceDemandPlan::getDeclareCompId,deviceDemandPlan.getDeclareCompId());
wrapper.eq(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
+ wrapper.orderByDesc(DeviceDemandPlan::getCreateTime);
return R.ok(deviceDemandPlanService.pageByScope(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
index 955925f..3268151 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
@@ -10,6 +10,7 @@
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.entity.DeviceDemandPlan;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.service.DeviceInventoryService;
import io.swagger.v3.oas.annotations.Operation;
@@ -51,6 +52,7 @@
wrapper.like(StringUtils.isNotBlank(deviceInventory.getDeviceNumber()),DeviceInventory::getDeviceNumber,deviceInventory.getDeviceNumber());
wrapper.like(StringUtils.isNotBlank(deviceInventory.getSerialNo()),DeviceInventory::getSerialNo,deviceInventory.getSerialNo());
wrapper.like(StringUtils.isNotBlank(deviceInventory.getName()),DeviceInventory::getName,deviceInventory.getName());
+ wrapper.orderByDesc(DeviceInventory::getCreateTime);
return R.ok(deviceInventoryService.page(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InvestmentPlanController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InvestmentPlanController.java
index b881e08..24d7d1b 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InvestmentPlanController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InvestmentPlanController.java
@@ -58,6 +58,7 @@
LambdaQueryWrapper<InvestmentPlan> wrapper = Wrappers.lambdaQuery();
wrapper.eq(investmentPlan.getYear()!=null,InvestmentPlan::getYear,investmentPlan.getYear());
wrapper.like(StringUtils.isNotBlank(investmentPlan.getName()),InvestmentPlan::getName,investmentPlan.getName());
+ wrapper.orderByDesc(InvestmentPlan::getCreateTime);
return R.ok(investmentPlanService.page(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/JcMaxSizeController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/JcMaxSizeController.java
index 9be4da2..133b618 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/JcMaxSizeController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/JcMaxSizeController.java
@@ -10,6 +10,7 @@
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.common.security.annotation.Inner;
import com.by4cloud.platformx.device.constant.MaxSizeContant;
+import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.MaxSize;
import com.by4cloud.platformx.device.service.JcMaxSizeService;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,6 +55,7 @@
LambdaQueryWrapper<MaxSize> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotBlank(jcMaxSize.getBusinessName()),MaxSize::getBusinessName,jcMaxSize.getBusinessName());
wrapper.eq(MaxSize::getType,0);
+ wrapper.orderByDesc(MaxSize::getCreateTime);
return R.ok(jcMaxSizeService.page(page, wrapper));
}
--
Gitblit v1.9.1