From 7a4b483f201ee0735040547c37399a7f9e845139 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 17 May 2023 16:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=85=B6=E4=BB=96=E7=A5=A8=E6=B1=A0?=
 =?UTF-8?q?=E7=9A=84=E6=9C=AA=E5=85=A5=E8=B4=A6=E5=AD=97=E6=AE=B5=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/pool/ExtInvoicePoolServiceImpl.java    | 14 +++++++-------
 .../main/resources/mapper/ExtInvoicePoolMapper.xml | 10 ++++++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
index d6c9b596..169b10e2 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
@@ -275,14 +275,14 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
                     pageList.get(i).setScanId(pageList.get(i).getScanId() == null ? "" : pageList.get(i).getScanId());
                     pageList.get(i)
                         .setInvoiceTypeString(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
-                    if (pageList.get(i).getInAccountStatus()!= null){
-                        if ("1".equals(pageList.get(i).getInAccountStatus())){
-                            pageList.get(i).setInAccountStatus("已入账");
-                        }
-                        if ("0".equals(pageList.get(i).getInAccountStatus())) {
-                            pageList.get(i).setInAccountStatus("未入账");
-                        }
+
+                    if ("1".equals(pageList.get(i).getInAccountStatus())){
+                        pageList.get(i).setInAccountStatus("已入账");
+                    }else {
+                        pageList.get(i).setInAccountStatus("未入账");
                     }
+
+
 //                    log.info("inAccountStatus=====>{}",pageList.get(i).getInAccountStatus());
 //                    pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
 //                            pageList.get(i).getInAccountStatus()));
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index e42ed5ee..4aa5874f 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -349,9 +349,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and account_period = #{accountPeriod}
         </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 inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (inaccount_status = '0' or inaccount_status = '' or inaccount_status is null)
+        </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </if>
@@ -446,9 +449,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and account_period = #{accountPeriod}
         </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 inaccount_status = #{inAccountStatus}
         </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (inaccount_status = '0' or inaccount_status = '' or inaccount_status is null)
+        </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </if>