From 0b7070db8f5f2147460d8132c2fb8430fc11cb8f Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 27 Apr 2023 15:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomsRecordDkrzServiceImpl.java    |  3 +--
 .../main/resources/mapper/ExtInvoicePoolMapper.xml    | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
index f85de567..5eb3e5fe 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
@@ -134,8 +134,7 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
                     map.put("qsType", dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
                     if ("1".equals(map.get("inAccountStatus"))){
                         map.put("inAccountStatus","已入账");
-
-                    }else if ("2".equals(map.get("inAccountStatus"))){
+                    }else if ("0".equals(map.get("inAccountStatus"))){
                         map.put("inAccountStatus","未入账");
                     }
 
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index d20ee4b2..24827b64 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -73,12 +73,10 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <if
-                test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
+        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
-        <if
-                test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
+        <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
             and t.invoice_status = #{invoiceStatus}
         </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
@@ -126,8 +124,7 @@
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and t.sn_voucher_number = #{snVoucherNumber}
         </if>
-        <if
-                test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
+        <if test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
             and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}
         </if>
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
@@ -179,7 +176,7 @@
         t.account_period accountPeriod,
         t.inaccount_status inAccountStatus,
         t.bzdh bzdh,
-        t.posting_time postingTime
+        t.posting_time postingTime,
         DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate,
         t.collect_from collectFrom
         from t_dx_record_invoice t