kongdeqiang
2025-03-31 110c67264a45e72b763681bf3d7721e16758c55f
fix: 修改page方法为倒叙
5个文件已修改
8 ■■■■■ 已修改文件
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/InvestmentPlanController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/JcMaxSizeController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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<>();
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));
    }
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));
    }
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));
    }
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));
    }