diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDetailMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDetailMapper.java index c89680377..023e46262 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDetailMapper.java +++ b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDetailMapper.java @@ -3,9 +3,8 @@ package com.ruoyi.xkt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.xkt.domain.StoreProductStorageDetail; import com.ruoyi.xkt.dto.storeProdStorage.StoreStorageDetailDownloadDTO; -import org.apache.ibatis.annotations.Param; +import com.ruoyi.xkt.dto.storeProdStorage.StoreStorageExportDTO; -import java.util.Date; import java.util.List; /** @@ -19,18 +18,17 @@ public interface StoreProductStorageDetailMapper extends BaseMapper selectExportList(@Param("storeProdStorageIdList") List storeProdStorageIdList); + List selectExportList(StoreStorageExportDTO exportDTO); /** * 导出指定时间段内的入库记录 * - * @param voucherDateStart 开始时间 - * @param voucherDateEnd 结束时间 + * @param exportDTO 导出入参 * @return 入库记录 */ - List selectExportListVoucherDateBetween(@Param("voucherDateStart") Date voucherDateStart, @Param("voucherDateEnd") Date voucherDateEnd); + List selectExportListVoucherDateBetween(StoreStorageExportDTO exportDTO); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDetailServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDetailServiceImpl.java index 00dbfd593..f239191a4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDetailServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDetailServiceImpl.java @@ -44,7 +44,7 @@ public class StoreProductStorageDetailServiceImpl implements IStoreProductStorag throw new ServiceException("当前用户非档口管理者或子账号,无权限操作!", HttpStatus.ERROR); } if (CollectionUtils.isNotEmpty(exportDTO.getStoreProdStorageIdList())) { - return this.storageDetailMapper.selectExportList(exportDTO.getStoreProdStorageIdList()); + return this.storageDetailMapper.selectExportList(exportDTO); } else { // 没有传时间,则设置当前时间往前推半年 if (ObjectUtils.isEmpty(exportDTO.getVoucherDateStart()) && ObjectUtils.isEmpty(exportDTO.getVoucherDateEnd())) { @@ -64,7 +64,7 @@ public class StoreProductStorageDetailServiceImpl implements IStoreProductStorag throw new ServiceException("导出时间间隔不能超过6个月!", HttpStatus.ERROR); } } - return this.storageDetailMapper.selectExportListVoucherDateBetween(exportDTO.getVoucherDateStart(), exportDTO.getVoucherDateEnd()); + return this.storageDetailMapper.selectExportListVoucherDateBetween(exportDTO); } } }