BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：系统导出功能完善；

pull/1121/head
liujiang 2025-10-03 22:41:45 +08:00
parent 91266309cd
commit d157234934
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
View File

@ -400,7 +400,8 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService
@Transactional(readOnly = true)
public List<StoreProdDemandDownloadDTO> export(StoreProdDemandExportDTO exportDTO) {
LambdaQueryWrapper<StoreProductDemandDetail> queryWrapper = new LambdaQueryWrapper<StoreProductDemandDetail>()
.eq(StoreProductDemandDetail::getStoreId, exportDTO.getStoreId()).eq(StoreProductDemandDetail::getDelFlag, Constants.UNDELETED);
.eq(StoreProductDemandDetail::getStoreId, exportDTO.getStoreId()).eq(StoreProductDemandDetail::getDelFlag, Constants.UNDELETED)
.orderByDesc(StoreProductDemandDetail::getCreateTime);
if (CollectionUtils.isNotEmpty(exportDTO.getStoreProdDemandDetailIdList())) {
queryWrapper.in(StoreProductDemandDetail::getId, exportDTO.getStoreProdDemandDetailIdList());
}

6
xkt/src/main/resources/mapper/StoreProductStockMapper.xml
View File

@ -124,6 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach collection="storeProdStockIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
ORDER BY
sps.store_prod_id,
sps.store_color_id
</select>
<select id="selectAllStockList" resultType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockDownloadDTO">
@ -156,6 +159,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach collection="storeProdColorIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
ORDER BY
sps.store_prod_id,
sps.store_color_id
</select>
<select id="selectWebsitePage" resultType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockWebsitePageResDTO">

4
xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml
View File

@ -56,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="storageType != null">
AND sps.storage_type = #{storageType}
</if>
ORDER BY
spsd.create_time DESC
</select>
<select id="selectExportListVoucherDateBetween" resultType="com.ruoyi.xkt.dto.storeProdStorage.StoreStorageDetailDownloadDTO">
@ -111,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="storageType != null">
AND sps.storage_type = #{storageType}
</if>
ORDER BY
spsd.create_time DESC
</select>
</mapper>

4
xkt/src/main/resources/mapper/StoreSaleMapper.xml
View File

@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<foreach collection="storeSaleIdList" item="storeSaleId" open="(" separator="," close=")">
#{storeSaleId}
</foreach>
ORDER BY
ss.create_time DESC
</select>
<select id="selectExportListVoucherDateBetween" resultType="com.ruoyi.xkt.dto.storeSale.StoreSaleDownloadDTO">
@ -69,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ss.del_flag = 0
AND ss.store_id = #{storeId}
AND ss.voucher_date BETWEEN #{voucherDateStart} AND #{voucherDateEnd}
ORDER BY
ss.create_time DESC
</select>