feat:硬件模块倒序

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardGroupMapper.java

@@ -19,13 +19,15 @@ public interface HardGroupMapper extends PjcloudBaseMapper<HardGroupEntity> {
 
     default Page<HardGroupVo> pageJoin(Page page, HardGroupDto dto) {
         MPJLambdaWrapper<HardGroupEntity> wrapper = new MPJLambdaWrapper<HardGroupEntity>()
-                .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<HardGroupVo> scopePageList(Page page, HardGroupDto dto) {
         LambdaQueryWrapper<HardGroupEntity> wrapper = new LambdaQueryWrapper<HardGroupEntity>()
-                .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<HardGroupEntity> {
     default List<HardGroupEntity> list(HardGroupDto dto) {
         LambdaQueryWrapper<HardGroupEntity> wrapper = new LambdaQueryWrapper<HardGroupEntity>()
                 .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);
     }
 }

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<HardInvoiceEntity>
         MPJLambdaWrapper<HardInvoiceEntity> wrapper = new MPJLambdaWrapper<HardInvoiceEntity>()
                 .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);
     }
 

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/HardManagerMapper.java

@@ -25,7 +25,8 @@ public interface HardManagerMapper extends PjcloudBaseMapper<HardManagerEntity>
                 .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<HardManagerEntity>
                 .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;

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<HardAfterSaleEnti
 
     default Page<HardAfterSaleVo> pageJoin(Page page, HardAfterSaleDto dto) {
         MPJLambdaWrapper<HardAfterSaleEntity> wrapper = new MPJLambdaWrapper<HardAfterSaleEntity>()
-                .selectAll(HardAfterSaleEntity.class);
+                .selectAll(HardAfterSaleEntity.class)
+                .orderByDesc(HardAfterSaleEntity::getCreateTime);
         return selectJoinPage(page, HardAfterSaleVo.class, wrapper);
     }
 

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> {
                         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<HardOrderEntity> {
                 .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);
     }
 

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/HardInvoiceMapper.xml

@@ -82,5 +82,6 @@
                 </foreach>
             </if>
         </where>
+        order by a.create_time desc
     </select>
 </mapper>

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardAfterSaleMapper.xml

@@ -93,5 +93,6 @@
         <where>
             <include refid="whereA"/>
         </where>
+        order by a.create_time desc
     </select>
 </mapper>