From cb0d9a0602a42ace263d4b28da2f12c1667337e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Wed, 23 Sep 2026 15:39:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=B9=E9=87=8F=E8=BD=AC=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=80=99=E9=80=89=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E5=8F=B7=E5=92=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReceivablePayableDetailController.java | 4 +++- .../transport/service/IReceivablePayableDetailService.java | 3 ++- .../service/impl/ReceivablePayableDetailServiceImpl.java | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ReceivablePayableDetailController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ReceivablePayableDetailController.java index 9790e3ee..c8cd804a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ReceivablePayableDetailController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ReceivablePayableDetailController.java @@ -133,13 +133,15 @@ public class ReceivablePayableDetailController extends BladeController { @ApiOperationSupport(order = 8) @Operation(summary = "转结算候选明细") public R>> transferCandidates(Query query, + @RequestParam(required = false) String documentNo, + @RequestParam(required = false) String contractNo, @RequestParam(required = false) String contractName, @RequestParam(required = false) String batchNo, @RequestParam(required = false) String generateStartDate, @RequestParam(required = false) String generateEndDate, @RequestParam(required = false) String settlementBillType, @RequestParam(required = false) String settlementType) { - return R.data(detailService.transferCandidates(Condition.getPage(query), contractName, batchNo, + return R.data(detailService.transferCandidates(Condition.getPage(query), documentNo, contractNo, contractName, batchNo, generateStartDate, generateEndDate, settlementBillType, settlementType)); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IReceivablePayableDetailService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IReceivablePayableDetailService.java index 6cc8546d..9938978f 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IReceivablePayableDetailService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IReceivablePayableDetailService.java @@ -69,7 +69,8 @@ public interface IReceivablePayableDetailService extends BaseService> transferCandidates(IPage page, String contractName, String batchNo, + IPage> transferCandidates(IPage page, String documentNo, String contractNo, + String contractName, String batchNo, String generateStartDate, String generateEndDate, String settlementBillType, String settlementType); diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java index 50749f13..8843b9f8 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java @@ -534,10 +534,13 @@ public class ReceivablePayableDetailServiceImpl } @Override - public IPage> transferCandidates(IPage page, String contractName, String batchNo, + public IPage> transferCandidates(IPage page, String documentNo, String contractNo, + String contractName, String batchNo, String generateStartDate, String generateEndDate, String settlementBillType, String settlementType) { ReceivablePayableDetailVO query = new ReceivablePayableDetailVO(); + query.setDocumentNo(documentNo); + query.setContractNo(contractNo); query.setContractName(contractName); query.setBatchNo(batchNo); query.setSettlementStatus("pending");