diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java index 585ba107..f32a9491 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/ReceiptFlowVO.java @@ -79,6 +79,16 @@ public class ReceiptFlowVO extends KingdeeReceiptFlow { @TableField(exist = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime transactionEndTime; + /** + * 收款金额区间-最小值(查询条件) + */ + @TableField(exist = false) + private BigDecimal receiptAmountStart; + /** + * 收款金额区间-最大值(查询条件) + */ + @TableField(exist = false) + private BigDecimal receiptAmountEnd; @TableField(exist = false) private List claimRecords = new ArrayList<>(); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java index ee987b62..dc463142 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java @@ -144,6 +144,10 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl claimedFlowIds = claimMapper.selectList(Wrappers.lambdaQuery() + .select(ReceiptClaim::getReceiptFlowId) + .like(ReceiptClaim::getClaimerName, query.getClaimerName()) + .eq(ReceiptClaim::getClaimStatus, CLAIMED)).stream() + .map(ReceiptClaim::getReceiptFlowId) + .filter(Objects::nonNull) + .distinct() + .toList(); + if (claimedFlowIds.isEmpty()) { + page.setRecords(List.of()); + page.setTotal(0); + return page.convert(ReceiptFlowWrapper.build()::entityVO); + } + wrapper.in(KingdeeReceiptFlow::getId, claimedFlowIds); + } return page(page, wrapper).convert(ReceiptFlowWrapper.build()::entityVO); }