From 8168aef3c7557c9e1361892270a1ebe35dbddba5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:19 +0800
Subject: [PATCH] refactor(erp): 采购申请与询价比价流程重构
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
index 0c989a6..1564a8e 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -31,15 +31,23 @@
}
default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO pageReqVO) {
- return selectPage(pageReqVO, new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+ LambdaQueryWrapperX<ErpPurchaseRequestDO> wrapper = new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
.likeIfPresent(ErpPurchaseRequestDO::getNo, pageReqVO.getNo())
.eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, pageReqVO.getRequestUserId())
.eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, pageReqVO.getRequestDeptId())
.eqIfPresent(ErpPurchaseRequestDO::getSupplierId, pageReqVO.getSupplierId())
+ .likeIfPresent(ErpPurchaseRequestDO::getInquiryNo, pageReqVO.getInquiryNo())
+ .likeIfPresent(ErpPurchaseRequestDO::getOrderNo, pageReqVO.getOrderNo())
.eqIfPresent(ErpPurchaseRequestDO::getStatus, pageReqVO.getStatus())
.eqIfPresent(ErpPurchaseRequestDO::getInStatus, pageReqVO.getInStatus())
- .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime())
- .orderByDesc(ErpPurchaseRequestDO::getId));
+ .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime());
+ // 寰呭鐞嗭細瀹℃壒閫氳繃鍚庯紝灏氭湭鍙戣捣璇环銆佷篃灏氭湭鐢熸垚閲囪喘鍙拌处
+ if (Boolean.TRUE.equals(pageReqVO.getTodo())) {
+ wrapper.isNull(ErpPurchaseRequestDO::getInquiryId)
+ .isNull(ErpPurchaseRequestDO::getOrderId);
+ }
+ wrapper.orderByDesc(ErpPurchaseRequestDO::getId);
+ return selectPage(pageReqVO, wrapper);
}
}
\ No newline at end of file
--
Gitblit v1.9.3