From eb8e9598bfde3fdcb18d21b214ddcdaa023b16b5 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 19 Apr 2023 14:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/ExtInvoicePoolMapper.xml | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index 5e83cd21..d5d251c1 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -188,12 +188,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'">
@@ -223,26 +221,27 @@
         <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
             and t.qs_type = #{qsfs}
         </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 t.payment_status = #{inAccountStatus}
         </if>
-        <if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
-            and t.posting_time = #{postingTime}
+        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and posting_time between #{postingTimeStart} and #{postingTimeEnd}
         </if>
-        <if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
-            and t.image_id = #{imageId}
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
         </if>
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </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'">
             and t.invoice_source = #{invoiceSource}
         </if>
+        <if test="snVoucherNumber !=null and snVoucherNumber !='' and snVoucherNumber !='99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
     </select>
     <!--其他发票汇总-->
     <select id="selectOtherHj" parameterType="java.util.Map"