From b520943126c615e441c6b0f3773f41f8c81e4cd0 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 16:45:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=8A=A5=E8=B4=A6=E4=BA=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAZJBRT=EF=BC=8C=E5=9B=A0=E4=B8=BAZJBR=E6=98=AF?=
 =?UTF-8?q?=E5=B7=A5=E5=8F=B7?=
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 db010c0d..f80d945f 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
@@ -379,7 +379,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                     //入账状态
                     updateWrapper.set("inaccount_status",zdata1.getZYWZT());
                     updateWrapper.set("comp_code",zdata1.getZGSDM());
-                    updateWrapper.set("bzr",zdata1.getZJBR());
+                    updateWrapper.set("bzr",zdata1.getZJBRT());
                     DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                     int update = tDxrecordInvoiceDao.update(null, updateWrapper);
                     if(update>0){
@@ -415,7 +415,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 //入账状态
                 updateWrapper.set("inaccount_status",zdata1.getZYWZT());
                 updateWrapper.set("comp_code",zdata1.getZGSDM());
-                updateWrapper.set("bzr",zdata1.getZJBR());
+                updateWrapper.set("bzr",zdata1.getZJBRT());
                 DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                 tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
             }
@@ -427,7 +427,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             updateWrapper.set("bzdh",zdata1.getZBZDH());
             updateWrapper.set("inaccount_status",zdata1.getZYWZT());
             updateWrapper.set("comp_code",zdata1.getZGSDM());
-            updateWrapper.set("bzr",zdata1.getZJBR());
+            updateWrapper.set("bzr",zdata1.getZJBRT());
             updateWrapper.eq("uuid",uuid);
             tdxSaleRecordInvoiceDao.update(null,updateWrapper);
             if(!flag){

From 63235edf8f4bde209a0720f8036ac246bfcba2d4 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 17:01:35 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java     | 6 ++++++
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index bd3c95ec..57e1bd05 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -685,6 +685,12 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
         } else if ("0".equals(baseTDxRecordInvoice.getInAccountStatus())) {
             vo.setInAccountStatus("未入账");
         }
+        if ("1".equals(vo.getSuspendStatus())){
+            vo.setSuspendStatus("是");
+        }else {
+            vo.setSuspendStatus("否");
+            vo.setSuspendDate("");
+        }
         vo.setPaymentStatus(dictdetaServcice.queryDictName(DictConstant.FK_STATUS,baseTDxRecordInvoice.getPaymentStatus()));
         vo.setPaymentDate(baseTDxRecordInvoice.getPaymentDate());
         vo.setGfmc(baseTDxRecordInvoice.getGfName());
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 3b217f7c..750bc91d 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1302,7 +1302,7 @@
         ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,
         case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
         true then 1
-        else 2 end authStatus,t.bzdh,
+        else 2 end authStatus,t.bzdh,t.bzr,t.suspend_status,t.suspend_date,
         t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq

From def02eab7d40173c39f7c4ae73084ff379d792f9 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 17:40:36 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 78362e02..4e4ffd7a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -78,6 +78,7 @@
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.auth_status != '0'
+        and t.rzh_yesorno != '0'
         and t.company = #{company}
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
@@ -345,6 +346,7 @@
         and t.auth_status != '0'
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
+        and t.rzh_yesorno != '0'
         and t.company =#{company}
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
@@ -383,7 +385,7 @@
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
             and t.inaccount_status = #{inAccountStatus}
         </if>
-        <if test="qszt != null and qszt != '' and qszt != 'null' ">
+        <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
         <if

From 4973f600b6946c5bb4d77802327d80456d68dce9 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 19:32:33 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 96c3c747..220c4702 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -100,6 +100,7 @@
         and t.bdk_status in ('1','2')
         and t.export_mark = '0'
         and t.auth_status != '0'
+        and t.rzh_yesorno != '0'
         and t.company = #{company}
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">

From 676e89d7a6aadb508d983c13f10dbbdf1799965c Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 20:26:28 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 10 ++++++++--
 .../src/main/resources/mapper/BaseSggxcxMapper.xml     | 10 ++++++++--
 .../src/main/resources/mapper/ExtBbfpzhMapper.xml      |  7 +++++--
 .../src/main/resources/mapper/ExtBbycfpcxMapper.xml    | 10 ++++++++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
index 4e4ffd7a..2980ff5a 100644
--- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
@@ -104,9 +104,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
@@ -382,9 +385,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 750bc91d..3ceba96c 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -124,9 +124,12 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
         </if>
@@ -483,9 +486,12 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="businessCode==''">
             and (t.dept_id is null or t.dept_id='' or t.dept_id='99')
         </if>
diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
index f0f0d302..7242a31b 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
@@ -342,8 +342,11 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
-            and t.in_account_status = #{inAccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
index 05efa5e4..3915015b 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
@@ -68,9 +68,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
@@ -190,9 +193,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>

From 2479e121b2b220ef05f58e2c1418cef63cb81ee2 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 20:37:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
index 7242a31b..a565392a 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
@@ -80,9 +80,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
             and t.invoice_status = #{invoiceStatus}

From cf9c6fa59d5cbad083c413b36109d878e7c7889c Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 23 May 2023 20:50:27 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml   |  5 ++++-
 dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml |  5 ++++-
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml     | 10 ++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml
index 3a91a151..f361cce6 100644
--- a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml
@@ -76,9 +76,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if
                 test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
             and t.invoice_status = #{invoiceStatus}
diff --git a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml
index e6957fc8..ef6ccf33 100644
--- a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml
@@ -61,9 +61,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 220c4702..43c32c20 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -126,9 +126,12 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' ">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
@@ -607,9 +610,12 @@
         <if test="suspendDate != null and suspendDate != '' and suspendDate != 'null' ">
             and t.suspend_date = #{suspendDate}
         </if>
-        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
+        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}
         </if>