From 76d5d9ad2aea11eb56d3fe79d8aaa2dc96cd267c Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 17:15:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=A1=AC=E4=BB=B6=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 --- .../com/bsd/pjcloud/hard/mapper/HardGroupMapper.java | 9 ++++++--- .../com/bsd/pjcloud/hard/mapper/HardInvoiceMapper.java | 6 ++---- .../com/bsd/pjcloud/hard/mapper/HardManagerMapper.java | 6 ++++-- .../pjcloud/hard/mapper/order/HardAfterSaleMapper.java | 4 +++- .../bsd/pjcloud/hard/mapper/order/HardOrderMapper.java | 6 ++++-- .../src/main/resources/mapper/HardInvoiceMapper.xml | 1 + .../main/resources/mapper/order/HardAfterSaleMapper.xml | 1 + 7 files changed, 21 insertions(+), 12 deletions(-) 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 69bf45497..733add50d 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 @@ -19,13 +19,15 @@ 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()); + .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) + .orderByDesc(HardGroupEntity::getCreateTime); 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()); + .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) + .orderByDesc(HardGroupEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), HardGroupVo.class)); return list; @@ -34,7 +36,8 @@ public interface HardGroupMapper extends PjcloudBaseMapper { default List list(HardGroupDto dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper() .like(ObjectUtil.isNotEmpty(dto.getName()), HardGroupEntity::getName, dto.getName()) - .in(ObjectUtil.isNotEmpty(dto.getIds()), HardGroupEntity::getId, dto.getIds()); + .in(ObjectUtil.isNotEmpty(dto.getIds()), HardGroupEntity::getId, dto.getIds()) + .orderByDesc(HardGroupEntity::getCreateTime); 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 923eb4a67..61e9f5075 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 @@ -1,9 +1,6 @@ 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; import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.hard.api.dto.HardInvoiceDto; @@ -20,7 +17,8 @@ public interface HardInvoiceMapper extends PjcloudBaseMapper MPJLambdaWrapper wrapper = new MPJLambdaWrapper() .selectAll(HardInvoiceEntity.class) .eqIfExists(HardInvoiceEntity::getHardId, dto.getHardId()) - .eqIfExists(HardInvoiceEntity::getOrderId, dto.getOrderId()); + .eqIfExists(HardInvoiceEntity::getOrderId, dto.getOrderId()) + .orderByDesc(HardInvoiceEntity::getCreateTime); 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 95c88ee67..16af55597 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 @@ -25,7 +25,8 @@ public interface HardManagerMapper extends PjcloudBaseMapper .eqIfExists(HardManagerEntity::getType, dto.getType()) .eqIfExists(HardManagerEntity::getMerchantId, dto.getMerchantId()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), HardManagerEntity::getDeptId, dto.getDeptIds()) - .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()); + .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()) + .orderByDesc(HardManagerEntity::getCreateTime); return selectJoinPage(page, HardManagerVo.class, wrapper); } @@ -43,7 +44,8 @@ public interface HardManagerMapper extends PjcloudBaseMapper .eq(ObjectUtil.isNotEmpty(dto.getType()), HardManagerEntity::getType, dto.getType()) .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()); + .in(ObjectUtil.isNotEmpty(dto.getMerchantIds()), HardManagerEntity::getMerchantId, dto.getMerchantIds()) + .orderByDesc(HardManagerEntity::getCreateTime); 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 88bcbe999..53c8b828c 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 @@ -5,6 +5,7 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.hard.api.dto.order.HardAfterSaleDto; 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; @@ -15,7 +16,8 @@ public interface HardAfterSaleMapper extends PjcloudBaseMapper pageJoin(Page page, HardAfterSaleDto dto) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() - .selectAll(HardAfterSaleEntity.class); + .selectAll(HardAfterSaleEntity.class) + .orderByDesc(HardAfterSaleEntity::getCreateTime); 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 1f3a99c1f..370a9d552 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 @@ -45,7 +45,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper { HardOrderEntity::getPayTime, ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[0] : null, ObjectUtil.isNotEmpty(dto.getPayTimeList()) ? dto.getPayTimeList()[1] : null - ); + ) + .orderByDesc(HardOrderEntity::getCreateTime); Page list = selectPageByScope(page, wrapper, DataScope.of()); list.setRecords(BeanUtils.toBean(list.getRecords(), HardOrderVo.class)); return list; @@ -60,7 +61,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper { .eqIfExists(HardOrderEntity::getOrderType, dto.getOrderType()) .eqIfExists(HardOrderEntity::getPayType, dto.getPayType()) .eqIfExists(HardOrderEntity::getOrderStatus, dto.getOrderStatus()) - .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds()); + .in(ObjectUtil.isNotEmpty(dto.getUserIds()), HardOrderEntity::getUserId, dto.getUserIds()) + .orderByDesc(HardOrderEntity::getCreateTime); 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 9f2c57a10..851124df9 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,5 +82,6 @@ + order by a.create_time 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 8e77b060f..0788bbb82 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,5 +93,6 @@ + order by a.create_time desc \ No newline at end of file