From bd8f8e3661190085fcf30f761e01c2978e0c2460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 5 Sep 2023 23:23:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/service/export/impl/QyswxxServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QyswxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QyswxxServiceImpl.java
index c12aab02..01a3dcce 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QyswxxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QyswxxServiceImpl.java
@@ -84,7 +84,9 @@ public class QyswxxServiceImpl extends MpBaseServiceImpl<QyswxxDao, QyswxxRespVO
                         }
                     }
                 }
-                hzxx.setSbzq(getSbzq(hzxx.getSbzq()));
+                if (StringUtils.isNotBlank(hzxx.getSbzq())){
+                    hzxx.setSbzq(getSbzq(hzxx.getSbzq()));
+                }
                 if ("0".equals(hzxx.getSdzt())) {
                     hzxx.setSdzt("否");
                 }

From c49c0eceb39fb7c97805d2bf4cd35a5a686a12ea Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 23:32:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?ariesy=20=E5=BC=82=E5=B8=B8=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/service/caution/ExtCautionExpirationServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
index 556b1b68..d8d3a65d 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
@@ -213,7 +213,7 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
 
         // 购方税号
         queryWrapper.eq("gf_tax_no",reqVO.getGfsh());
-        queryWrapper.eq("comp_code",reqVO.getCompanyCode()).or().eq("comp_code","").or().isNull("comp_code");
+        queryWrapper.eq("comp_code",reqVO.getCompanyCode());
         // 发票号码
         if (StringUtils.isNotBlank(reqVO.getInvoiceNo())) {
             queryWrapper.lambda().eq(ExtTdxRecordInvoice::getInvoiceNo, reqVO.getInvoiceNo());

From 9804463c8e8103d20a60aad1cc93ce95e70dc98b Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 23:36:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ariesy=20=E5=8F=91=E7=A5=A8=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=A4=B1=E8=B4=A5=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java | 2 +-
 .../com/dxhy/core/service/export/impl/QssbServiceImpl.java  | 6 +++---
 dxhy-core/src/main/resources/mapper/QssbMapper.xml          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java
index ed1d1d72..e9be922f 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/QssbRespVO.java
@@ -106,7 +106,7 @@ public class QssbRespVO implements Serializable {
     private String imageId;
     private String accountPeriod;
     private String compCode;
-    private String inaccountStatus;
+    private String inAccountStatus;
     private String bzdh;
     private String bzr;
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java
index 42d7b57f..482a903b 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/QssbServiceImpl.java
@@ -60,10 +60,10 @@ public class QssbServiceImpl extends MpBaseServiceImpl<QssbDao, QssbRespVO> impl
                 resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe()));
 
                 //字典值转换
-                if ("1".equals(resultList.get(i).getInaccountStatus())){
-                    resultList.get(i).setInaccountStatus("已入账");
+                if ("1".equals(resultList.get(i).getInAccountStatus())){
+                    resultList.get(i).setInAccountStatus("已入账");
                 }else {
-                    resultList.get(i).setInaccountStatus("未入账");
+                    resultList.get(i).setInAccountStatus("未入账");
                 }
                 resultList.get(i).setQsfs(dictdetaServcice.queryDictName(DictConstant.QS_TYPE,resultList.get(i).getQsfs()));
                 resultList.get(i).setInvoiceType(dictdetaServcice.queryDictName(DictConstant.INVOICE_TYPE_VAT,resultList.get(i).getInvoiceType()));
diff --git a/dxhy-core/src/main/resources/mapper/QssbMapper.xml b/dxhy-core/src/main/resources/mapper/QssbMapper.xml
index 6d436628..eeabfc16 100644
--- a/dxhy-core/src/main/resources/mapper/QssbMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QssbMapper.xml
@@ -20,7 +20,7 @@
         <result column="je" property="je"/>
         <result column="se" property="se"/>
         <result column="deptName" property="businessName"/>
-        <result column="inaccount_status" property="inaccountStatus"/>
+        <result column="inaccount_status" property="inAccountStatus"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
         <result column="posting_time" property="postingTime"/>
         <result column="image_id" property="imageId"/>