From fc0db201e10ed1cc6d68aaf0a37d65933398c2f6 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 28 三月 2025 16:05:23 +0800
Subject: [PATCH] 库存流水 合同 验收 台账 厂商 招标 中标 技术协议 列表根据时间倒序
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java | 2 +-
platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml | 1 +
platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml | 1 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java | 2 +-
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 3 +++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java | 1 +
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java | 3 ++-
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java | 3 ++-
8 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
index 07ac4df..8d8d98c 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
@@ -57,6 +57,7 @@
wrapper.eq(contract.getType()!=null,Contract::getType,contract.getType());
wrapper.like(StringUtils.isNotEmpty(contract.getName()),Contract::getName,contract.getName());
wrapper.like(StringUtils.isNotEmpty(contract.getNumber()),Contract::getNumber,contract.getNumber());
+ wrapper.orderByDesc(Contract::getCreateTime);
return R.ok(contractService.page(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
index 66c878a..8495ef1 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceLeasingLedgerController.java
@@ -54,7 +54,8 @@
LambdaQueryWrapper<DeviceLeasingLedger> wrapper = Wrappers.lambdaQuery();
wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getContractCode()),DeviceLeasingLedger::getContractCode,deviceLeasingLedger.getContractCode());
wrapper.eq(StrUtil.isNotBlank(deviceLeasingLedger.getLedgerCode()),DeviceLeasingLedger::getLedgerCode,deviceLeasingLedger.getLedgerCode());
- return R.ok(deviceLeasingLedgerService.page(page, wrapper));
+ wrapper.orderByDesc(DeviceLeasingLedger::getCreateTime);
+ return R.ok(deviceLeasingLedgerService.page(page, wrapper));
}
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..32eb8b1 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));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
index e0ab86d..85732b8 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java
@@ -55,7 +55,7 @@
public R getPurchaseTendrOrderPage(@ParameterObject Page page, @ParameterObject PurchaseTendrOrderEntity purchaseTendrOrder) {
LambdaQueryWrapper<PurchaseTendrOrderEntity> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotEmpty(purchaseTendrOrder.getPurchasePlanCode()),PurchaseTendrOrderEntity::getPurchasePlanCode,purchaseTendrOrder.getPurchasePlanCode());
- wrapper.orderBy(true,false, PurchaseTendrOrderEntity::getCreateTime);
+ wrapper.orderByDesc(PurchaseTendrOrderEntity::getCreateTime);
return R.ok(purchaseTendrOrderService.page(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
index 6ee6066..ed3d14f 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseWinningLetterController.java
@@ -55,7 +55,7 @@
LambdaQueryWrapper<PurchaseWinningLetterEntity> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotEmpty(purchaseWinningLetter.getPurchasePlanCode()), PurchaseWinningLetterEntity::getPurchasePlanCode,purchaseWinningLetter.getPurchasePlanCode());
wrapper.like(StringUtils.isNotEmpty(purchaseWinningLetter.getWinningCode()), PurchaseWinningLetterEntity::getWinningCode,purchaseWinningLetter.getWinningCode());
- wrapper.orderBy(true,false, PurchaseWinningLetterEntity::getCreateTime);
+ wrapper.orderByDesc(PurchaseWinningLetterEntity::getCreateTime);
return R.ok(purchaseWinningLetterService.page(page, wrapper));
}
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
index f939b40..1c3ce2f 100644
--- a/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceTechnicalAgreementMapper.xml
@@ -48,6 +48,7 @@
<if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
</if>
+ order by dta.create_time desc
</select>
</mapper>
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
index 9f9ab0b..9248666 100644
--- a/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/InventoryFlowWaterMapper.xml
@@ -36,5 +36,6 @@
<if test="queryDTO.deviceName != null and queryDTO.deviceName !=''">
and d.name like CONCAT('%', #{queryDTO.deviceName}, '%')
</if>
+ order by ifw.create_time desc
</select>
</mapper>
diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 2ad25b2..456c1da 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -37,5 +37,8 @@
<if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
</if>
+ order by
+ rn.create_time
+ desc
</select>
</mapper>
--
Gitblit v1.9.1