diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java index 733add50d..6a2000877 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.hard.mapper; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -10,6 +11,7 @@ import com.bsd.pjcloud.hard.api.dto.HardGroupDto; import com.bsd.pjcloud.hard.api.entity.HardGroupEntity; import com.bsd.pjcloud.hard.api.vo.HardGroupVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -20,14 +22,16 @@ public interface HardGroupMapper extends PjcloudBaseMapper { default Page pageJoin(Page page, HardGroupDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) - .orderByDesc(HardGroupEntity::getCreateTime); + .orderByDesc(HardGroupEntity::getCreateTime) + .orderByDesc(HardGroupEntity::getDeptId); return selectJoinPage(page, HardGroupVo.class, wrapper); } default Page scopePageList(Page page, HardGroupDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) - .orderByDesc(HardGroupEntity::getCreateTime); + .orderByDesc(HardGroupEntity::getCreateTime) + .orderByDesc(HardGroupEntity::getDeptId); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), HardGroupVo.class)); return list; @@ -37,7 +41,8 @@ public interface HardGroupMapper extends PjcloudBaseMapper { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getIds()), HardGroupEntity::getId, dto.getIds()) - .orderByDesc(HardGroupEntity::getCreateTime); + .orderByDesc(HardGroupEntity::getCreateTime) + .orderByDesc(HardGroupEntity::getDeptId); return selectList(wrapper); } } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java index 61e9f5075..1d02f6f55 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java @@ -18,7 +18,8 @@ public interface HardInvoiceMapper extends PjcloudBaseMapper .selectAll(HardInvoiceEntity.class) .eqIfExists(HardInvoiceEntity::getHardId, dto.getHardId()) .eqIfExists(HardInvoiceEntity::getOrderId, dto.getOrderId()) - .orderByDesc(HardInvoiceEntity::getCreateTime); + .orderByDesc(HardInvoiceEntity::getCreateTime) + .orderByDesc(HardInvoiceEntity::getId); return selectJoinPage(page, HardInvoiceVo.class, wrapper); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java index 16af55597..a3d64cc5f 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.hard.mapper; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -10,6 +11,7 @@ import com.bsd.pjcloud.hard.api.dto.HardManagerDto; import com.bsd.pjcloud.hard.api.entity.HardManagerEntity; import com.bsd.pjcloud.hard.api.vo.HardManagerVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -26,7 +28,8 @@ public interface HardManagerMapper extends PjcloudBaseMapper .eqIfExists(HardManagerEntity::getMerchantId, dto.getMerchantId()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), HardManagerEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()) - .orderByDesc(HardManagerEntity::getCreateTime); + .orderByDesc(HardManagerEntity::getCreateTime) + .orderByAsc(HardManagerEntity::getId); return selectJoinPage(page, HardManagerVo.class, wrapper); } @@ -45,7 +48,8 @@ public interface HardManagerMapper extends PjcloudBaseMapper .eq(ObjectUtil.isNotEmpty(dto.getType()), HardManagerEntity::getMerchantId, dto.getMerchantId()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), HardManagerEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()) - .orderByDesc(HardManagerEntity::getCreateTime); + .orderByDesc(HardManagerEntity::getCreateTime) + .orderByAsc(HardManagerEntity::getId); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), HardManagerVo.class)); return list; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java index 53c8b828c..312a949e4 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleMapper.java @@ -8,6 +8,7 @@ import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleEntity; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.vo.order.HardAfterSaleVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -17,7 +18,8 @@ public interface HardAfterSaleMapper extends PjcloudBaseMapper pageJoin(Page page, HardAfterSaleDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .selectAll(HardAfterSaleEntity.class) - .orderByDesc(HardAfterSaleEntity::getCreateTime); + .orderByDesc(HardAfterSaleEntity::getCreateTime) + .orderByDesc(HardAfterSaleEntity::getId); return selectJoinPage(page, HardAfterSaleVo.class, wrapper); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java index 7f07035f9..e15bc7882 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.hard.mapper.order; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -12,6 +13,7 @@ import com.bsd.pjcloud.hard.api.entity.HardManagerEntity; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.vo.order.*; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -45,7 +47,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper { ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[0] : null, ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[1] : null ) - .orderByDesc(HardOrderEntity::getCreateTime); + .orderByDesc(HardOrderEntity::getCreateTime) + .orderByDesc(HardOrderEntity::getUserId); return wrapper; } @@ -67,7 +70,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper { .eqIfExists(HardOrderEntity::getPayType, dto.getPayType()) .eqIfExists(HardOrderEntity::getOrderStatus, dto.getOrderStatus()) .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds()) - .orderByDesc(HardOrderEntity::getCreateTime); + .orderByDesc(HardOrderEntity::getCreateTime) + .orderByDesc(HardOrderEntity::getUserId); return selectJoinPage(page, HardOrderVo.class, wrapper); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml index 851124df9..9aee10fea 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml @@ -82,6 +82,6 @@ - order by a.create_time desc + order by a.create_time desc, a.id desc \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml index 0788bbb82..5683c61da 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml @@ -93,6 +93,6 @@ - order by a.create_time desc + order by a.create_time desc,a.id desc \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 2a341dd0c..f158b22ef 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -212,9 +212,8 @@ - - ORDER BY u.create_time DESC + ORDER BY u.create_time DESC, u.user_id DESC 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 d9f8eb3f6..6792c0c55 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 @@ -1,6 +1,7 @@ package com.bsd.pjcloud.wallet.mapper; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -11,6 +12,7 @@ import com.bsd.pjcloud.wallet.api.entity.MchManageEntity; import com.bsd.pjcloud.wallet.api.vo.MchManageVo; import com.github.yulichang.query.MPJLambdaQueryWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -18,14 +20,14 @@ import java.util.List; @Mapper public interface MchManageMapper extends PjcloudBaseMapper { - default Page pageJoin(Page page, MchManageDto dto) { MPJLambdaQueryWrapper wrapper = new MPJLambdaQueryWrapper() .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()) - .orderByDesc(MchManageEntity::getCreateTime); + .orderByDesc(MchManageEntity::getCreateTime) + .orderByDesc(MchManageEntity::getId); return selectJoinPage(page, MchManageVo.class, wrapper); } @@ -44,7 +46,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { .likeIfExists(MchManageEntity::getName, dto.getName()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), MchManageEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getIds()), MchManageEntity::getId, dto.getIds()) - .orderByDesc(MchManageEntity::getCreateTime); + .orderByDesc(MchManageEntity::getCreateTime) + .orderByDesc(MchManageEntity::getId); return selectJoinList(MchManageVo.class, wrapper); } @@ -53,7 +56,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { .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()) - .orderByDesc(MchManageEntity::getCreateTime); + .orderByDesc(MchManageEntity::getCreateTime) + .orderByDesc(MchManageEntity::getId); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), MchManageVo.class)); return list; @@ -64,7 +68,8 @@ public interface MchManageMapper extends PjcloudBaseMapper { .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()) - .orderByDesc(MchManageEntity::getCreateTime); + .orderByDesc(MchManageEntity::getCreateTime) + .orderByDesc(MchManageEntity::getId); 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/WalletCodeUseMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletCodeUseMapper.java index 6f69766b3..1d999fb18 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletCodeUseMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletCodeUseMapper.java @@ -1,22 +1,19 @@ package com.bsd.pjcloud.wallet.mapper; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.wallet.api.dto.WalletCodeUseDto; -import com.bsd.pjcloud.wallet.api.entity.WalletActiveEntity; import com.bsd.pjcloud.wallet.api.entity.WalletCodeUseEntity; -import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity; -import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity; import com.bsd.pjcloud.wallet.api.vo.WalletCodeUseVo; -import com.bsd.pjcloud.wallet.api.vo.WalletManageVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; @Mapper public interface WalletCodeUseMapper extends PjcloudBaseMapper { - default Page pageJoin(Page page, WalletCodeUseDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .selectAll(WalletCodeUseEntity.class) @@ -25,7 +22,8 @@ public interface WalletCodeUseMapper extends PjcloudBaseMapper scopePageList(Page page, WalletForeignDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(dto.getProcessStatus()), WalletForeignEntity::getProcessStatus, dto.getProcessStatus()) + .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()) - .orderByDesc(WalletForeignEntity::getCreateTime); + .orderByDesc(WalletForeignEntity::getCreateTime) + .orderByDesc(WalletForeignEntity::getId); 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/WalletFreezeMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletFreezeMapper.java index 010057cc5..4325ccbab 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletFreezeMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletFreezeMapper.java @@ -1,20 +1,16 @@ package com.bsd.pjcloud.wallet.mapper; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.wallet.api.dto.WalletFreezeDto; -import com.bsd.pjcloud.wallet.api.entity.WalletActiveEntity; import com.bsd.pjcloud.wallet.api.entity.WalletFreezeEntity; import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity; -import com.bsd.pjcloud.wallet.api.vo.WalletActiveVo; import com.bsd.pjcloud.wallet.api.vo.WalletFreezeVo; -import com.bsd.pjcloud.wallet.api.vo.WalletManageVo; -import com.github.yulichang.query.MPJLambdaQueryWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -27,7 +23,9 @@ public interface WalletFreezeMapper extends PjcloudBaseMapper wrapper = new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dto.getUserId()), WalletManageEntity::getUserId, dto.getUserId()) .eq(ObjectUtil.isNotEmpty(dto.getDeptId()), WalletManageEntity::getDeptId, dto.getDeptId()) - .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletManageEntity::getWalletTypeId, dto.getWalletTypeId()) + .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletManageEntity::getWalletTypeId, + dto.getWalletTypeId()) .eq(ObjectUtil.isNotEmpty(dto.getIsFreeze()), WalletManageEntity::getIsFreeze, dto.getIsFreeze()) .in(ObjectUtil.isNotEmpty(dto.getWalletIds()), WalletManageEntity::getId, dto.getWalletIds()) .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds()) @@ -109,18 +112,23 @@ public interface WalletManageMapper extends PjcloudBaseMapper list(WalletManageDto dto) { LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper() .eq(ObjectUtil.isNotEmpty(dto.getUserId()), WalletManageEntity::getUserId, dto.getUserId()) - .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletManageEntity::getWalletTypeId, dto.getWalletTypeId()) + .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletManageEntity::getWalletTypeId, + dto.getWalletTypeId()) .eq(ObjectUtil.isNotEmpty(dto.getIsFreeze()), WalletManageEntity::getIsFreeze, dto.getIsFreeze()) .in(ObjectUtil.isNotEmpty(dto.getWalletIds()), WalletManageEntity::getId, dto.getWalletIds()) .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds()) - .orderByDesc(WalletManageEntity::getCreateTime); + .orderByDesc(WalletManageEntity::getCreateTime) + .orderByDesc(WalletManageEntity::getUserId) + .orderByDesc(WalletManageEntity::getWalletTypeId); return selectList(wrapper); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java index 3f43a7381..4f60f2fcb 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.wallet.mapper; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -10,6 +11,7 @@ import com.bsd.pjcloud.wallet.api.dto.WalletStrideDto; import com.bsd.pjcloud.wallet.api.entity.WalletStrideEntity; import com.bsd.pjcloud.wallet.api.vo.WalletStrideVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; @Mapper @@ -21,7 +23,8 @@ public interface WalletStrideMapper extends PjcloudBaseMapper scopePageList(Page page, WalletStrideDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(dto.getProcessStatus()), WalletStrideEntity::getProcessStatus, dto.getProcessStatus()) + .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()) - .orderByDesc(WalletStrideEntity::getCreateTime); + .orderByDesc(WalletStrideEntity::getCreateTime) + .orderByDesc(WalletStrideEntity::getId); 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 8fe2c23e1..f4f2db308 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 @@ -1,6 +1,7 @@ package com.bsd.pjcloud.wallet.mapper; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -15,6 +16,7 @@ import com.bsd.pjcloud.wallet.api.vo.WalletTransactionSumAndCountVo; import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplySelectCompareVo; import com.bsd.pjcloud.wallet.api.vo.transaction.WalletTransactionVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -38,12 +40,15 @@ public interface WalletTransactionMapper extends PjcloudBaseMapper selectCompare(@Param("bizType") String bizType, @Param("dateTime") String monthTimeStr, @Param("userIdList") List userIdList); + List selectCompare(@Param("bizType") String bizType, + @Param("dateTime") String monthTimeStr, + @Param("userIdList") List userIdList); List sumAndCount(@Param("dto") WalletTransactionSumAndCountDto dto); } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java index 91c9de039..fd5b18ddd 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.wallet.mapper.recharge; import cn.hutool.core.util.ObjectUtil; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.BeanUtils; @@ -13,6 +14,7 @@ import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity; import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplyVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -28,8 +30,10 @@ public interface WalletRechargeApplyMapper extends PjcloudBaseMapper scopePageList(Page page, WalletRechargeApplyDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(dto.getWalletTypeId()), WalletRechargeApplyEntity::getWalletTypeId, dto.getWalletTypeId()) + .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()) - .orderByDesc(WalletRechargeApplyEntity::getCreateTime); + .in(ObjectUtil.isNotEmpty(dto.getWalletTypeIds()), WalletRechargeApplyEntity::getWalletTypeId, + dto.getWalletTypeIds()) + .orderByDesc(WalletRechargeApplyEntity::getCreateTime) + .orderByDesc(WalletRechargeApplyEntity::getId); 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 86a510182..fd5bca6f7 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 @@ -7,6 +7,7 @@ import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeImportDto; import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity; import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeImportVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; + import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,7 +16,8 @@ import java.util.List; @Mapper public interface WalletRechargeImportMapper extends PjcloudBaseMapper { - Page scopePageList(Page page, @Param("dto") WalletRechargeImportDto dto, DataScope dataScope); + Page scopePageList(Page page, @Param("dto") WalletRechargeImportDto dto, + DataScope dataScope); List scopeList(@Param("dto") WalletRechargeImportDto dto, DataScope dataScope); @@ -23,7 +25,8 @@ public interface WalletRechargeImportMapper extends PjcloudBaseMapper wrapper = new MPJLambdaWrapper() .eqIfExists(WalletRechargeImportEntity::getId, dto.getId()) .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()) - .orderByDesc(WalletRechargeImportEntity::getCreateTime); + .orderByDesc(WalletRechargeImportEntity::getCreateTime) + .orderByDesc(WalletRechargeImportEntity::getUserId); return selectJoinPage(page, WalletRechargeImportVo.class, wrapper); } @@ -31,7 +34,8 @@ public interface WalletRechargeImportMapper extends PjcloudBaseMapper wrapper = new MPJLambdaWrapper() .eqIfExists(WalletRechargeImportEntity::getId, dto.getId()) .eqIfExists(WalletRechargeImportEntity::getApplyId, dto.getApplyId()) - .orderByDesc(WalletRechargeImportEntity::getCreateTime); + .orderByDesc(WalletRechargeImportEntity::getCreateTime) + .orderByDesc(WalletRechargeImportEntity::getUserId); return selectJoinList(WalletRechargeImportVo.class, wrapper); } } \ No newline at end of file