From 5f71a86a51e9fd4b220878e646a43f251315ee4b Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 26 Jul 2023 09:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/thread/FpzhcxslExportThread.java     |  44 +++++--
 .../main/resources/mapper/BbfpzhslMapper.xml  | 119 +++++++++++-------
 2 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxslExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxslExportThread.java
index 4f9b1658..fdaf725a 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxslExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxslExportThread.java
@@ -1,6 +1,7 @@
 package com.dxhy.core.thread;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dxhy.common.service.impl.TabulateRedisServiceImpl;
 import com.dxhy.common.util.ExcelPoiUtil;
@@ -129,12 +130,35 @@ public class FpzhcxslExportThread extends BaseThread {
                 String glzt = prams.getString("glzt");
                 String rzlx = prams.getString("rzlx");
                 String company = prams.getString("company");
+                String menuId = prams.getString("menuId");
+                String bzr = prams.getString("bzr");
                 List<Business> businesses = (List<Business>)prams.get("userBusiness");
+                String bzdh = prams.getString("bzdh");
+                String imageNumber = prams.getString("imageNumber");
                 String inAccountStatus = prams.getString("inAccountStatus");
+                String snVoucherNumber =prams.getString("snVoucherNumber");
+                String companyCode = prams.getString("companyCode");
+                JSONArray companyCodeArray = prams.getJSONArray("companyCodes");
+                List<String> companyCodes = companyCodeArray.toJavaList(String.class);
+                String accountPeriod = prams.getString("accountPeriod");
+                if (org.apache.commons.lang3.StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){
+                    accountPeriod = accountPeriod.substring(0,7);
+                }
+                String postingTimeEnd = prams.getString("postingTimeEnd");
+                String postingTimeStart = prams.getString("postingTimeStart");
                 // 参数转换为需要的形式
                 Map<String, Object> pramsMap = new HashMap<>(31);
                 pramsMap.put("dbName", dbName);
                 pramsMap.put("business", businesses);
+                pramsMap.put("bzr",bzr);
+                pramsMap.put("bzdh",bzdh);
+                pramsMap.put("imageNumber",imageNumber);
+                pramsMap.put("inAccountStatus",inAccountStatus);
+                pramsMap.put("snVoucherNumber",snVoucherNumber);
+                pramsMap.put("postingTimeEnd",postingTimeEnd);
+                pramsMap.put("postingTimeStart",postingTimeStart);
+                pramsMap.put("accountPeriod",accountPeriod);
+
                 List<String> gfshList = new ArrayList<>();
                 if (!StringHelper.isBlank(gfsh)) {
                     gfshList = StringHelper.stringToList(gfsh);
@@ -167,6 +191,11 @@ public class FpzhcxslExportThread extends BaseThread {
                         pramsMap.put("invoiceStatus", invoiceStatus);
                     }
                 }
+                if (!StringHelper.isBlank(glzt)) {
+                    if (!"99".equals(glzt)) {
+                        pramsMap.put("glzt", glzt);
+                    }
+                }
                 if ("1".equals(rzzt) || "2".equals(rzzt) || "3".equals(rzzt)) {
                     if (!StringHelper.isBlank(skssq)) {
                         pramsMap.put("skssq", skssq.replace("-", ""));
@@ -183,16 +212,15 @@ public class FpzhcxslExportThread extends BaseThread {
                     if (!"99".equals(qsfs)) {
                         pramsMap.put("qsfs", qsfs);
                     }
-                    if (!StringHelper.isBlank(qsjsrq)) {
+                    if (!StringHelper.isBlank(qsksrq)) {
                         pramsMap.put("qsksrq", DateUtils.getMorning(DateUtils.strToDate(qsksrq)));
                     }
                     if (!StringHelper.isBlank(qsjsrq)) {
                         pramsMap.put("qsjsrq", DateUtils.getNight(DateUtils.strToDate(qsjsrq)));
                     }
-                    if (!"99".equals(prams.getString("businessCode"))) {
-                        pramsMap.put("businessCode", prams.getString("businessCode"));
-                    }
+                    pramsMap.put("businessCode", prams.getString("businessCode"));
                 }
+
                 pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(kpksrq)));
                 pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(kpjsrq)));
                 pramsMap.put("invoiceNo", invoiceNo);
@@ -204,15 +232,13 @@ public class FpzhcxslExportThread extends BaseThread {
                 pramsMap.put("amountMax", prams.getString("amountMax"));
                 pramsMap.put("taxAmountMin", prams.getString("taxAmountMin"));
                 pramsMap.put("taxAmountMax", prams.getString("taxAmountMax"));
+                pramsMap.put("settlementNo", prams.getString("settlementNo"));
                 pramsMap.put("voucherNumber", prams.getString("voucherNumber"));
+                pramsMap.put("companyCodes",companyCodes);
+                pramsMap.put("companyCode",companyCode);
                 if (!StringHelper.isBlank(rzlx) && !"99".equals(rzlx)) {
                     pramsMap.put("rzlx", rzlx);
                 }
-                if (!StringHelper.isBlank(glzt)) {
-                    if (!"99".equals(glzt)) {
-                        pramsMap.put("glzt", glzt);
-                    }
-                }
                 pramsMap.put("company", company);
                 if (StringUtils.isNotBlank(inAccountStatus)) {
                     pramsMap.put("inAccountStatus", inAccountStatus);
diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml
index c29d61e2..f94cdc43 100644
--- a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml
@@ -34,40 +34,62 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99' ">
-            and t.invoice_status = #{invoiceStatus}
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (t.comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
         </if>
-        <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
-            and t.qs_status = #{qszt}
+        <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
         </if>
-        <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
-            and t.qs_type = #{qsfs}
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
+            and (t.comp_code = '' or t.comp_code is null)
         </if>
-        <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
-            and t.qs_date between #{qsksrq} and #{qsjsrq}
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
+            and t.bzdh = #{bzdh}
         </if>
-        <if test="rzksrq != null and rzksrq != '' and rzksrq != 'null' and rzjsrq != null and rzjsrq != '' and rzjsrq != 'null'">
-            and t.rzh_date between #{rzksrq} and #{rzjsrq}
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != '99'">
-            and t.rzh_yesorno = #{rzzt}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
         </if>
-        <if test="rzclzt != null and rzclzt != '' and rzclzt != 'null'  and rzclzt != '99'">
-            and t.auth_status = #{rzclzt}
+        <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="rzlx != null and rzlx != '' and rzlx != 'null' and rzlx != '99'">
-            and t.bdk_status = #{rzlx}
+        <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'">
+            and t.qs_status = #{qszt}
+        </if>
+        <if test="voucherNumber != null and voucherNumber != ''">
+            and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
+        </if>
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99'">
+            and t.rzh_yesorno = #{rzzt}
         </if>
         <if
-                test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
+                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' ">
             and t.invoice_source = #{invoiceSource}
         </if>
         <if
-                test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99' ">
-            and t.qs_type = #{qsfs}
+                test="fprzfs != null and fprzfs != '' and fprzfs != 'null' and fprzfs != '99'">
+            and t.rzh_type = #{fprzfs}
+        </if>
+        <if
+                test="fprzclzt != null and fprzclzt != '' and fprzclzt != 'null' and fprzclzt != '99'">
+            and t.auth_status = #{fprzclzt}
+        </if>
+        <if test="rzlx != null and rzlx != '' and rzlx != 'null' and rzlx != '99'">
+            and t.bdk_status = #{rzlx}
         </if>
         <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">
             and t.xf_name like CONCAT(#{xfmc},'%')
@@ -89,32 +111,36 @@
         <if test="taxAmountMax!=null and taxAmountMax!=''">
             and t.tax_amount &lt;= #{taxAmountMax}
         </if>
-        <if
-                test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null'  ">
-            and t.invoice_no = #{invoiceNo}
-        </if>
-        <if test="skssq != null and skssq != '' and skssq != 'null' ">
-            and t.rzh_belong_date = #{skssq}
+
+        <if test="qsr != null and qsr != '' and qsr != 'null' ">
+            and t.qs_name = #{qsr}
         </if>
-        <if test="rzksrq != null and rzjsrq != null ">
-            and t.rzh_date between #{rzksrq} and #{rzjsrq}
+        <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
+            and t.confirm_user like CONCAT(#{rzhr},'%')
         </if>
-        <if test="qsjsrq != null and qsjsrq != null ">
-            and t.qs_date between #{qsksrq} and #{qsjsrq}
-        </if>
-        <if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
-            and t.qs_type = #{qsfs}
+        <if test="settlementNo != null and settlementNo != ''">
+            and t.settlement_no like concat(#{settlementNo},'%')
         </if>
         <if test="glzt != null and glzt != '' and glzt != 'null' and glzt != '99'">
             and t.glzt = #{glzt}
         </if>
-        <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
-            and t.confirm_user like CONCAT(#{rzhr},'%')
+        <if test="invoiceNo != null and invoiceNo != '' and invoiceNo != 'null' ">
+            and t.invoice_no = #{invoiceNo}
         </if>
-        <if test="qsr != null and qsr != '' and qsr != 'null' ">
-            and t.qs_name = #{qsr}
+        <if test="rzksrq != null and rzjsrq != null and rzksrq != '' and rzjsrq != ''">
+            and t.rzh_date between #{rzksrq} and #{rzjsrq}
         </if>
-        <if test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">
+        <if test="skssq != null and skssq != '' and skssq != 'null' ">
+            and t.rzh_belong_date = #{skssq}
+        </if>
+        <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
+            and t.qs_type = #{qsfs}
+        </if>
+        <if test="qsksrq != null and qsjsrq != null and qsksrq != '' and qsjsrq != ''">
+            and t.qs_date between #{qsksrq} and #{qsjsrq}
+        </if>
+        <if
+                test="businessCode != '99' and businessCode != null and businessCode != '' and businessCode != 'null' ">
             and t.dept_id = #{businessCode}
         </if>
         <if test="businessCode==''">
@@ -127,16 +153,21 @@
             </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 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="company != null and company !=''">
-            and t.company = #{company}
+        <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="voucherNumber!=null and voucherNumber!=''and voucherNumber!='null'">
-            and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
+        <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>
-        order by t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="oracle">