From 787fec680395ca06af87870c18065ef1696343d9 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Fri, 3 Oct 2025 21:32:32 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=AF=BC=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8BUG=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xkt/mapper/StoreProductStorageDetailMapper.java  | 12 +++++-------
 .../impl/StoreProductStorageDetailServiceImpl.java   |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

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<StoreProduct
     /**
      * 导出选定的入库记录
      *
-     * @param storeProdStorageIdList 入库单ID列表
+     * @param exportDTO 导出入参
      * @return 入库记录
      */
-    List<StoreStorageDetailDownloadDTO> selectExportList(@Param("storeProdStorageIdList") List<Long> storeProdStorageIdList);
+    List<StoreStorageDetailDownloadDTO> selectExportList(StoreStorageExportDTO exportDTO);
 
     /**
      * 导出指定时间段内的入库记录
      *
-     * @param voucherDateStart 开始时间
-     * @param voucherDateEnd   结束时间
+     * @param exportDTO 导出入参
      * @return 入库记录
      */
-    List<StoreStorageDetailDownloadDTO> selectExportListVoucherDateBetween(@Param("voucherDateStart") Date voucherDateStart, @Param("voucherDateEnd") Date voucherDateEnd);
+    List<StoreStorageDetailDownloadDTO> 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);
         }
     }
 }