diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionDto.java index f6398a928..bfbfa9976 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionDto.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionDto.java @@ -58,4 +58,10 @@ public class WalletTransactionDto extends WalletTransactionEntity implements Bas */ private Boolean isInclude; + + /** + * 金额区间 + */ + private List priceList; + } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java index 0b7e97d2c..5c874cd5f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java @@ -109,7 +109,9 @@ public class WalletTransactionController { if (ObjectUtil.isNotEmpty(dto.getPrice())) { dto.setPrice(dto.getPrice() * 100); } - + if (ObjectUtil.isNotEmpty(dto.getPriceList())) { + dto.setPriceList(dto.getPriceList().stream().map(item -> item * 100).toList()); + } DataScope dataScope = new DataScope(); return R.ok(walletTransactionService.pageCzTotalList(dto, dataScope)); } @@ -122,6 +124,9 @@ public class WalletTransactionController { if (ObjectUtil.isNotEmpty(dto.getPrice())) { dto.setPrice(dto.getPrice() * 100); } + if (ObjectUtil.isNotEmpty(dto.getPriceList())) { + dto.setPriceList(dto.getPriceList().stream().map(item -> item * 100).toList()); + } walletTransactionService.exportCzTotal(response, dto, null); } @@ -133,6 +138,9 @@ public class WalletTransactionController { if (ObjectUtil.isNotEmpty(dto.getPrice())) { dto.setPrice(dto.getPrice() * 100); } + if (ObjectUtil.isNotEmpty(dto.getPriceList())) { + dto.setPriceList(dto.getPriceList().stream().map(item -> item * 100).toList()); + } DataScope dataScope = new DataScope(); return R.ok(walletTransactionService.listDeptCzTotal(dto, dataScope)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml index a5844eccc..507660478 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml @@ -50,6 +50,12 @@ and a.price = #{dto.price} + + and a.price in + + #{v} + + and a.price > 0