From 0b43f24a202a60e5fa83bbdb5ffdd3119a092f1d Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 18:21:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=92=B1=E5=8C=85=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallet/controller/WalletTypeController.java | 1 + .../recharge/WalletRechargePackageController.java | 1 + .../bsd/pjcloud/wallet/mapper/MchManageMapper.java | 12 ++++++++---- .../pjcloud/wallet/mapper/WalletActiveMapper.java | 6 ++++-- .../pjcloud/wallet/mapper/WalletCodeUseMapper.java | 4 +++- .../pjcloud/wallet/mapper/WalletForeignMapper.java | 6 ++++-- .../pjcloud/wallet/mapper/WalletManageMapper.java | 9 ++++++--- .../pjcloud/wallet/mapper/WalletStrideMapper.java | 6 ++++-- .../wallet/mapper/WalletTransactionMapper.java | 6 ++++-- .../mapper/recharge/WalletRechargeApplyMapper.java | 10 +++++++--- .../mapper/recharge/WalletRechargeImportMapper.java | 6 ++++-- .../mapper/recharge/WalletRechargePackageMapper.java | 3 ++- .../mapper/recharge/WalletRechargeImportMapper.xml | 1 + 13 files changed, 49 insertions(+), 22 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java index 5c5cae8f6..d8e5a71f6 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java @@ -48,6 +48,7 @@ public class WalletTypeController { @PreAuthorize("@pms.hasPermission('wallet_walletType_view')" ) public R getWalletTypePage(@ParameterObject Page page, @ParameterObject WalletTypeEntity walletType) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.orderByDesc(WalletTypeEntity::getCreateTime); return R.ok(walletTypeService.page(page, wrapper)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java index 1d02957ed..ce59a3604 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargePackageController.java @@ -50,6 +50,7 @@ public class WalletRechargePackageController { @PreAuthorize("@pms.hasPermission('wallet_walletRechargePackage_view')") public R getWalletRechargePackagePage(@ParameterObject Page page, @ParameterObject WalletRechargePackageEntity walletRechargePackage) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.orderByDesc(WalletRechargePackageEntity::getCreateTime); return R.ok(walletRechargePackageService.page(page, wrapper)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java index 3eaaffbe6..be4a36c55 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/MchManageMapper.java @@ -24,7 +24,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { .selectAll(MchManageEntity.class) .likeIfExists(MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) - .apply(ObjectUtil.isNotEmpty(dto.getType()), "FIND_IN_SET({0}, types)", dto.getType()); + .apply(ObjectUtil.isNotEmpty(dto.getType()), "FIND_IN_SET({0}, types)", dto.getType()) + .orderByDesc(MchManageEntity::getCreateTime); return selectJoinPage(page, MchManageVo.class, wrapper); } @@ -40,7 +41,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { .selectAll(MchManageEntity.class) .likeIfExists(MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()); + .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) + .orderByDesc(MchManageEntity::getCreateTime); return selectJoinList(MchManageVo.class, wrapper); } @@ -48,7 +50,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()); + .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) + .orderByDesc(MchManageEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), MchManageVo.class)); return list; @@ -58,7 +61,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(ObjectUtil.isNotEmpty(dto.getName()), MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()); + .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) + .orderByDesc(MchManageEntity::getCreateTime); return selectListByScope(wrapper, DataScope.of()); } } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java index cb8cb3ca3..6dafa0cb4 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletActiveMapper.java @@ -21,7 +21,8 @@ public interface WalletActiveMapper extends PjcloudBaseMapper wrapper = new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dto.getProcessStatus()), WalletForeignEntity::getProcessStatus, dto.getProcessStatus()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletForeignEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds()); + .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds()) + .orderByDesc(WalletForeignEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), WalletForeignVo.class)); return list; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java index e1c871278..55a815371 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java @@ -75,7 +75,8 @@ public interface WalletManageMapper extends PjcloudBaseMapper wrapper = new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dto.getProcessStatus()), WalletStrideEntity::getProcessStatus, dto.getProcessStatus()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletStrideEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds()); + .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds()) + .orderByDesc(WalletStrideEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), WalletStrideVo.class)); return list; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java index 314f94fb3..ee718d60f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletTransactionMapper.java @@ -37,7 +37,8 @@ public interface WalletTransactionMapper extends PjcloudBaseMapper wrapper = new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeId()) .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletRechargeApplyEntity::getUserId, dto.getUserIds()) - .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeIds()); + .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeIds()) + .orderByDesc(WalletRechargeApplyEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), WalletRechargeApplyVo.class)); return list; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java index a4104f25b..a1fbbcbaa 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeImportMapper.java @@ -20,14 +20,16 @@ public interface WalletRechargeImportMapper extends PjcloudBaseMapper pageJoin(Page page, WalletRechargeImportDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .eqIfExists(WalletRechargeImportEntity::getId, dto.getId()) - .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()); + .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()) + .orderByDesc(WalletRechargeImportEntity::getCreateTime); return selectJoinPage(page, WalletRechargeImportVo.class, wrapper); } default List listJoin(WalletRechargeImportDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .eqIfExists(WalletRechargeImportEntity::getId, dto.getId()) - .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()); + .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()) + .orderByDesc(WalletRechargeImportEntity::getCreateTime); return selectJoinList(WalletRechargeImportVo.class, wrapper); } } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java index 90eda03c7..4696e6b29 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargePackageMapper.java @@ -15,7 +15,8 @@ public interface WalletRechargePackageMapper extends PjcloudBaseMapper pageJoin(Page page, WalletRechargePackageDto dto) { - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .orderByDesc(WalletRechargePackageEntity::getCreateTime); return selectJoinPage(page, WalletRechargePackageEntity.class, wrapper); } } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml index f33ab7d87..798eb0639 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeImportMapper.xml @@ -85,5 +85,6 @@ and p.process_time between #{dto.processTimeList[0]} and #{dto.processTimeList[1]} + order by a.create_time desc \ No newline at end of file