From 81bda9441c1de11d78e518dbe5ee632ba7144c90 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期一, 31 三月 2025 11:55:57 +0800 Subject: [PATCH] 验收明细和出租台账中可按设备单次验收或出租 所有验收明细中设备数量与合同中设备数量一致修改合同状态 所有台账明细中设备数量与合同中设备数量一致修改合同状态 --- platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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)); } -- Gitblit v1.9.1