From c5a79128d1a7e6170d3a21d2d74e3da5497dd0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Fri, 10 Jan 2025 13:12:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dsic/gj_erp/controller/jhgk/DmSygdMxController.java  | 3 ++-
 .../com/dsic/gj_erp/listeners/ExcelJhxfListener.java     | 6 +++---
 src/main/resources/mappers/jhgk/DmXbjhMapper.xml         | 9 +++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
index 5024d23..9e37a68 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
@@ -163,7 +163,8 @@ public class DmSygdMxController {
 
         String fileName = file.getOriginalFilename();
         fileName=StrUtil.removeSuffix(fileName, ".xls");
-        //ydjhImportService.handler(objList, fileName, req);
+        fileName=StrUtil.removeSuffix(fileName, ".xlsx");
+        ydjhImportService.handler(objList, fileName, req);
         return new ResultBean(fileName);
     }
 
diff --git a/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java b/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java
index ed311da..0494d8c 100644
--- a/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java
+++ b/src/main/java/com/dsic/gj_erp/listeners/ExcelJhxfListener.java
@@ -32,14 +32,14 @@ public class ExcelJhxfListener extends AnalysisEventListener<JhxfExcel> {
     @Override
     public void invoke(JhxfExcel excelDemo, AnalysisContext analysisContext) {
         if (size==1&&excelDemo.isAvailable()
-                &&!dcch.equals(excelDemo.getDcCh())
-                &&!dcpl.equals(excelDemo.getDcPl())
+                &&StrUtil.isAllNotEmpty(dcch,dcpl,excelDemo.getDcCh(),excelDemo.getDcPl())
+                &&(!dcch.equals(excelDemo.getDcCh())||!dcpl.equals(excelDemo.getDcPl()))
         ){
             JhxfExcel jhxfExcel = new JhxfExcel();
             jhxfExcel.setDcCh(dcch);
             jhxfExcel.setDcPl(dcpl);
             datas.add(jhxfExcel);
-            size+=1;
+            size=0;
         }
 
         if(StringUtils.isBlank(excelDemo.getDcCh())){
diff --git a/src/main/resources/mappers/jhgk/DmXbjhMapper.xml b/src/main/resources/mappers/jhgk/DmXbjhMapper.xml
index 7638ae9..b928686 100644
--- a/src/main/resources/mappers/jhgk/DmXbjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmXbjhMapper.xml
@@ -35,19 +35,16 @@
 
     <select id="getList" resultType="com.dsic.gj_erp.bean.jhgk.DmXbjh">
         SELECT a.*
-        FROM dm_xbjh a --left join DM_CBXXP b on a.dc_ch =b.CBBM
+        FROM dm_xbjh a
         WHERE
-            b.wgbs ='N'
-            <if test="version!=null and version!=''">
-                and version=#{version}
-            </if>
+            version=#{version}
             <if test="dcCh!=null and dcCh!=''">
                 and dc_ch=#{dcCh}
             </if>
             <if test="nf!=null and nf!=''">
                 and nf BETWEEN #{startTime} AND #{endTime}
             </if>
-        ORDER BY zl DESC
+        ORDER BY yf ,zl DESC
     </select>
 
 </mapper>