diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java index 321c3fae4..c8a39f25a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreSaleMapper.java @@ -6,9 +6,7 @@ import com.ruoyi.xkt.dto.storeSale.StoreSaleDownloadDTO; import com.ruoyi.xkt.dto.storeSale.StoreSaleExportDTO; import com.ruoyi.xkt.dto.storeSale.StoreSalePageDTO; import com.ruoyi.xkt.dto.storeSale.StoreSalePageResDTO; -import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** @@ -21,24 +19,25 @@ public interface StoreSaleMapper extends BaseMapper { /** * 分页 + * * @param pageDTO 入参 - * @return + * @return List */ List selectPage(StoreSalePageDTO pageDTO); /** * 导出指定id列表 * - * @param storeSaleIdList 导出入参 + * @param exportDTO 导出入参 * @return List */ - List selectExportList(@Param("storeSaleIdList") List storeSaleIdList); + List selectExportList(StoreSaleExportDTO exportDTO); /** * 导出指定时间段内的数据 * * @param exportDTO 导出入参 - * @return + * @return List */ List selectExportListVoucherDateBetween(StoreSaleExportDTO exportDTO); diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java index eb5ed3149..7b1cfb0ef 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java @@ -213,10 +213,10 @@ public class StoreSaleServiceImpl implements IStoreSaleService { if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(exportDTO.getStoreId())) { throw new ServiceException("当前用户非档口管理者或子账号,无权限操作!", HttpStatus.ERROR); } - List downloadList = new ArrayList<>(); + List downloadList; // 导出指定销售出库单 if (CollectionUtils.isNotEmpty(exportDTO.getStoreSaleIdList())) { - downloadList = this.storeSaleMapper.selectExportList(exportDTO.getStoreSaleIdList()); + downloadList = this.storeSaleMapper.selectExportList(exportDTO); } else { // 没有传时间,则设置当前时间往前推半年 if (ObjectUtils.isEmpty(exportDTO.getVoucherDateStart()) && ObjectUtils.isEmpty(exportDTO.getVoucherDateEnd())) { diff --git a/xkt/src/main/resources/mapper/StoreSaleMapper.xml b/xkt/src/main/resources/mapper/StoreSaleMapper.xml index d272ea5fd..d3ddec9a9 100644 --- a/xkt/src/main/resources/mapper/StoreSaleMapper.xml +++ b/xkt/src/main/resources/mapper/StoreSaleMapper.xml @@ -41,10 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE ss.del_flag = 0 AND ss.store_id = #{storeId} - AND ss.id IN - - #{storeSaleId} - + + AND ss.id IN + + #{storeSaleId} + + ORDER BY ss.create_time DESC