From 7e7945536d315d2ec6d7923c33cdb032b468b81a Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Wed, 23 Aug 2023 09:13:58 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=B0=BD=E6=94=B6=E5=B0=8E=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/export/impl/ExportCautionServiceImpl.java     | 8 +++-----
 .../src/main/resources/mapper/TDxCustomsRecordMapper.xml  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java
index d9d85fbc..74da9d6c 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/ExportCautionServiceImpl.java
@@ -79,12 +79,10 @@ public class ExportCautionServiceImpl extends MpBaseServiceImpl<TDxRecordInvoice
             // 认证状态为未认证
             .eq(TDxRecordInvoice::getRzhYesorno, RzztEnum.WRZ.getRzztDm())
             // 发票状态为异常的发票
-            .in(TDxRecordInvoice::getInvoiceStatus, FpztEnum.YC.getFpztDm(), FpztEnum.ZF.getFpztDm(),
-                FpztEnum.HC.getFpztDm(), FpztEnum.SK.getFpztDm());
+            .ne(TDxRecordInvoice::getInvoiceStatus, FpztEnum.ZC.getFpztDm());
         // 购方税号
-        if (reqVO.getAllTaxNo().size() > 0) {
-            queryWrapper.lambda().in(TDxRecordInvoice::getGfTaxNo, reqVO.getAllTaxNo());
-        }
+        queryWrapper.eq("gf_tax_no",reqVO.getGfsh());
+        queryWrapper.eq("comp_code",reqVO.getCompanyCode());
         // 发票号码
         if (!StringHelper.isBlank(reqVO.getInvoiceNo())) {
             queryWrapper.lambda().eq(TDxRecordInvoice::getInvoiceNo, reqVO.getInvoiceNo());
diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
index 4181b9a0..0a9fabd7 100644
--- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml
@@ -1034,7 +1034,7 @@
         t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code
         where t.user_account = #{queryParams.userAccount}
         <if test="gfsh!=null">
-            and t.gf_tax_no =#{gfsh}
+            and t.gf_tax_no =#{queryParams.gfsh}
         </if>
         <if test="companyCode!=null">
             and t.comp_code =#{companyCode}