From d8dee58fed4bcf41ec219c20ea28214e2fdaaf14 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 11 May 2023 19:03:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=94=B9sql=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=20comp=5Fcode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
index 1574d470..64bd9b0c 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
@@ -378,7 +378,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                     updateWrapper.set("bzdh",zdata1.getZBZDH());
                     //入账状态
                     updateWrapper.set("inaccount_status",zdata1.getZYWZT());
-                    updateWrapper.set("company_code",zdata1.getZGSDM());
+                    updateWrapper.set("comp_code",zdata1.getZGSDM());
                     DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                     int update = tDxrecordInvoiceDao.update(null, updateWrapper);
                     if(update>0){
@@ -413,7 +413,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 updateWrapper.set("bzdh",zdata1.getZBZDH());
                 //入账状态
                 updateWrapper.set("inaccount_status",zdata1.getZYWZT());
-                updateWrapper.set("company_code",zdata1.getZGSDM());
+                updateWrapper.set("comp_code",zdata1.getZGSDM());
                 DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                 tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
             }
@@ -424,7 +424,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             updateWrapper.set("account_period",zdata1.getBUDAT().substring(0,7));
             updateWrapper.set("bzdh",zdata1.getZBZDH());
             updateWrapper.set("inaccount_status",zdata1.getZYWZT());
-            updateWrapper.set("company_code",zdata1.getZGSDM());
+            updateWrapper.set("comp_code",zdata1.getZGSDM());
             updateWrapper.eq("uuid",uuid);
             tdxSaleRecordInvoiceDao.update(null,updateWrapper);
             if(!flag){

From 4946442848503cdb80b630d2637a84958652890c Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 11 May 2023 19:42:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=96=B0sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
index 3889c8c8..57fe13d9 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
@@ -86,10 +86,10 @@
         <if test="qszt != null and qszt != '' and qszt != 'null' ">
             and t.qs_status = #{qszt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != '3'">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != 3">
             and t.rzh_yesorno = #{rzzt}
         </if>
-        <if test="rzzt != null and rzzt == '3'">
+        <if test="rzzt != null and rzzt == 3">
             and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1')
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">