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");