From e5977257949f2b59be2523c4c8d42c0a2a4555c6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 16:09:34 +0800
Subject: [PATCH] yys  修改导入导出bug

---
 src/main/resources/mapper/purchase/ProductRecordMapper.xml                               |    2 +-
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java                    |    2 +-
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
index 9929336..51ad7bd 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -40,7 +40,7 @@
     /**
      * 寰呭嚭搴撴暟閲�
      */
-    @Excel(name = "寰呭嚭搴撴暟閲�")
+//    @Excel(name = "寰呭嚭搴撴暟閲�")
     private BigDecimal inboundNum0;
 
 
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 5184b0c..24b58ab 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -129,12 +129,16 @@
         // 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
         List<Integer> collect = list.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
         if(CollectionUtils.isEmpty( collect)){
+            ExcelUtil<ProcurementPageDto> util = new ExcelUtil<ProcurementPageDto>(ProcurementPageDto.class);
+            util.exportExcel(response, list, "鍏ュ簱鍙拌处");
             return;
         }
         LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
         List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
         if(CollectionUtils.isEmpty( procurementRecords)){
+            ExcelUtil<ProcurementPageDto> util = new ExcelUtil<ProcurementPageDto>(ProcurementPageDto.class);
+            util.exportExcel(response, list, "鍏ュ簱鍙拌处");
             return;
         }
         for (ProcurementPageDto dto : list) {
diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index dd5aac6..e1646b8 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -27,7 +27,7 @@
             and sl.sales_contract_no = #{c.salesContractNo}
         </if>
         <if test="c.supplierName != null and c.supplierName != ''">
-            and sl.supplier_name = #{c.supplierName}
+            and pl.supplier_name = #{c.supplierName}
         </if>
         <if test="c.createdAtStart != null and c.createdAtStart != ''">
             and pr.created_at &gt;= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')

--
Gitblit v1.9.3