b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 付款管理列表结算单号查询兼容预结算单号

Browse Source
This commit is contained in:
刘泉佳
2026-09-29 15:22:48 +08:00
parent a9eb1d82d4
commit 952b735a53
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
+5 -1
View File
@@ -176,7 +176,11 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
.like(Func.isNotEmpty(query.getPayeeName()), PaymentApplication::getPayeeName, query.getPayeeName())
.like(Func.isNotEmpty(query.getProjectName()), PaymentApplication::getProjectName, query.getProjectName())
.like(Func.isNotEmpty(query.getDeptName()), PaymentApplication::getDeptName, query.getDeptName())
.like(Func.isNotEmpty(query.getSettlementNo()), PaymentApplication::getSettlementNo, query.getSettlementNo())
// 按结算单号查询时，同时匹配付款申请单号和预付款申请单号
.and(Func.isNotEmpty(query.getSettlementNo()), w -> w
.like(PaymentApplication::getSettlementNo, query.getSettlementNo())
.or()
.like(PaymentApplication::getPreSettlementNo, query.getSettlementNo()))
.eq(Func.isNotEmpty(query.getPaymentType()), PaymentApplication::getPaymentType, query.getPaymentType())
.eq(Func.isNotEmpty(query.getApprovalStatus()), PaymentApplication::getApprovalStatus, query.getApprovalStatus())
.eq(Func.isNotEmpty(query.getKingdeeStatus()), PaymentApplication::getKingdeeStatus, query.getKingdeeStatus())