From 74762fde11e56eaf684909c4a3a69cd25d309d1f Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 22 May 2023 16:48:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=B7=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=92=8C=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../export/impl/RzFpxxServiceImpl.java        |   2 +-
 .../src/main/resources/mapper/FpZhMapper.xml  | 101 +++++-------------
 2 files changed, 27 insertions(+), 76 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
index f421f90c..b01ef5f3 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
@@ -71,7 +71,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                 List<String[]> returnList = new ArrayList<>();
                 if (resultList != null && resultList.size() > 0) {
                     for (int i = 0; i < pageList.size(); i++) {
-                        String[] dataArray = new String[21];
+                        String[] dataArray = new String[23];
                         dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
                         dataArray[1] = pageList.get(i).getInvoiceCode();
                         dataArray[2] = pageList.get(i).getInvoiceNo();
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index c5a28cc7..b066e363 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -101,71 +101,47 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <if test="companyCodes != null and companyCodes != '99' and companyCodes != '88' and companyCodes != '' and companyCodes != 'null'" >
-            and t.comp_code = #{companyCodes}
-        </if>
-        <if test="companyCodes != null and companyCodes != ''  and companyCodes == '88'">
-            and (t.comp_code = '' or t.comp_code is null)
-        </if>
-
-        <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
+        <if
+                test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99' ">
             and t.invoice_status = #{invoiceStatus}
         </if>
         <if test="voucherNumber != null and voucherNumber != ''">
             and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
         </if>
-        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
-            and t.bzdh = #{bzdh}
-        </if>
-        <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.inaccount_status = #{inAccountStatus}
-        </if>
         <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
             and t.qs_status = #{qszt}
         </if>
-        <if test="qsfs != null and qsfs != '' and qsfs != 'null'">
+        <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
             and t.qs_type = #{qsfs}
         </if>
-        <if test="wrzfpStart != null and wrzfpStart != '' and wrzfpStart != 'null' and wrzfpEnd != null and wrzfpEnd != '' and wrzfpEnd != 'null'">
-            and rzh_yesorno = '0' and date_format(t.invoice_date,'%Y-%m-%d') between #{wrzfpStart} and #{wrzfpEnd}
-        </if>
-        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
+        <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>
         <if
                 test="rzksrq != null and rzksrq != '' and rzksrq != 'null' and rzjsrq != null and rzjsrq != '' and rzjsrq != 'null'">
             and date_format(t.rzh_date,'%Y-%m-%d') between #{rzksrq} and #{rzjsrq}
         </if>
-        <if test="accountPeriodStart != null and accountPeriodStart != '' and accountPeriodStart != 'null'
-         and accountPeriodEnd != null and accountPeriodEnd != '' and accountPeriodEnd != 'null'">
-            and date_format(t.account_period,'%Y-%m') between #{accountPeriodStart} and #{accountPeriodEnd}
-        </if>
-        <if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null'
-        and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null'">
-            and date_format(t.posting_time,'%Y-%m-%d') between #{postingTimeStart} and #{postingTimeEnd}
-        </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '3'">
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != '99'">
             and t.rzh_yesorno = #{rzzt}
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt == '3'">
-            and (t.rzh_yesorno = '1' or t.rzh_yesorno = '2')
+        <if test="rzclzt != null and rzclzt != '' and rzclzt != 'null'  and rzclzt != '99'">
+            and t.auth_status = #{rzclzt}
         </if>
-        <if test="imageId != null and imageId != '' and imageId != 'null' ">
-            and t.image_id = #{imageId}
+        <if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
+            <![CDATA[ AND date_format(t.payment_date,'%Y-%m-%d') >= #{paymentDateStart} ]]>
         </if>
-        <if test="rzclzt !=null and rzclzt != ''">
-            and t.auth_status = #{rzclzt}
+        <if test="paymentDateEnd != null and paymentDateEnd != '' and paymentDateEnd != 'null' ">
+            <![CDATA[ AND date_format(t.payment_date,'%Y-%m-%d')  <= #{paymentDateEnd} ]]>
         </if>
-        <if test="rzlx!=null and rzlx!=''">
-            and t.bdk_status = #{rzlx}
+        <if test="paymentStatus != null and paymentStatus != '' and paymentStatus != '99'">
+            and t.payment_status = #{paymentStatus}
         </if>
-        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' ">
-            and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') )
+        <if test="rzlx !=null and rzlx != ''">
+            and t.bdk_status = #{rzlx}
         </if>
-        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '14' ">
+        <if
+                test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='null' and invoiceSource!='99'">
@@ -174,15 +150,8 @@
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
-        <if
-                test="qsfs != null and qsfs != '' and qsfs != 'null' ">
-            and t.qs_type = #{qsfs}
-        </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
-            and t.xf_name like concat(#{xfmc},'%')
-        </if>
-        <if test="qsr != null and qsr != '' and qsr != 'null' ">
-            and t.qs_name = #{qsr}
+            and t.xf_name like CONCAT(#{xfmc},'%')
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
             and t.confirm_user in
@@ -191,25 +160,13 @@
             </foreach>
         </if>
         <if
-                test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
+                test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null'  ">
             and t.invoice_no = #{invoiceNo}
         </if>
-        <if test="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
-            <![CDATA[ AND date_format(t.payment_date,'%Y-%m-%d') >= #{paymentDateStart} ]]>
-        </if>
-        <if test="paymentDateEnd != null and paymentDateEnd != '' and paymentDateEnd != 'null' ">
-            <![CDATA[ AND date_format(t.payment_date,'%Y-%m-%d')  <= #{paymentDateEnd} ]]>
-        </if>
-        <if test="paymentStatus != null and paymentStatus != '' and paymentStatus != '99'">
-            and t.payment_status = #{paymentStatus}
-        </if>
         <if
                 test="skssq != null and skssq != '' and skssq != 'null' ">
             and t.rzh_belong_date = #{skssq}
         </if>
-        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' ">
-            and t.sn_voucher_number = #{snVoucherNumber}
-        </if>
         <if
                 test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">
             and t.dept_id = #{businessCode}
@@ -224,20 +181,14 @@
             </foreach>
             ) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
         </if>
-        <!--        <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
-        <!--            and t.in_account_status = #{inAccountStatus}-->
-        <!--        </if>-->
-        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
-            and t.sn_voucher_number = #{snVoucherNumber}
-        </if>
-        <if test="postingTimeStart != null and postingTimeEnd != null and postingTimeStart != '' and postingTimeEnd != ''">
-            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        <if test='inAccountStatus != null and inAccountStatus !="" and inAccountStatus!="99"'>
+            and t.in_account_status = #{inAccountStatus}
         </if>
-        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
-            and t.image_id = #{imageNumber}
+        <if test="company !=null and company !=''">
+            and t.company = #{company}
         </if>
-        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
-            and t.account_period = #{accountPeriod}
+        <if test="qsr != null and qsr != '' and qsr != 'null' ">
+            and t.qs_name = #{qsr}
         </if>
         order by t.rzh_date desc,t.invoice_date desc
     </select>