From b082a4e4909a657211a05b8422a1e5aafda822ce Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 30 May 2023 10:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/core/thread/ManualAthensThread.java  |   3 +
 .../dxhy/core/thread/RzFpxxExportThread.java  |   3 +
 .../main/resources/mapper/ExtPaperMapper.xml  | 142 +++++++++++++-----
 .../src/main/resources/mapper/FpZhMapper.xml  |  43 +++++-
 4 files changed, 144 insertions(+), 47 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
index fedadc85..ada14005 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
@@ -174,6 +174,9 @@ public class ManualAthensThread extends BaseThread {
                 pramsMap.put("imageNumber",imageNumber);
                 pramsMap.put("postingTimeEnd",postingTimeEnd);
                 pramsMap.put("postingTimeStart",postingTimeStart);
+                if (StringHelper.isBlank(gfsh)){
+                    pramsMap.put("sign","88");
+                }
                 List<String> gfshList = new ArrayList<>();
                 if (!StringHelper.isBlank(gfsh)) {
                     gfshList = StringHelper.stringToList(gfsh);
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
index b386f99c..28d820dc 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
@@ -178,6 +178,9 @@ public class RzFpxxExportThread extends BaseThread {
                 pramsMap.put("bzr",bzr);
                 pramsMap.put("companyCodes",companyCodes);
 
+                if (StringHelper.isBlank(gfsh)){
+                    pramsMap.put("sign","88");
+                }
                 List<String> gfshList = new ArrayList<>();
                 if (!StringHelper.isBlank(gfsh)) {
                     gfshList = StringHelper.stringToList(gfsh);
diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index 037cff7a..36294c82 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -555,13 +555,14 @@
             AND t.invoice_date between #{kpksrq} and #{kpjsrq}
         </if>
         <if test="keyWord != null and keyWord != '' and keyWord != 'null' ">
-            and CONCAT(IFNULL(t.invoice_code,''),IFNULL(t.invoice_no,''),IFNULL(t.xf_name,'')) like
+            and CONCAT(IFNULL(t.invoice_code,''),IFNULL(t.invoice_no,''),IFNULL(t.xf_name,''),IFNULL(t.xf_tax_no,''))
+            like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <!--        and t.gf_tax_no in-->
+        <!--        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">-->
+        <!--            #{item}-->
+        <!--        </foreach>-->
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
@@ -590,13 +591,16 @@
             and t.qs_name like CONCAT(#{qsr},'%')
         </if>
         <if test="rzr != null and rzr != '' and rzr != 'null' ">
-            and t.confirm_user like CONCAT(#{rzr},'%')
+            and t.gx_user_name like CONCAT(#{rzr},'%')
         </if>
         <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'">
-            and t.payment_status = #{inAccountStatus}
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <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="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
             and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}
@@ -604,6 +608,38 @@
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
             and t.invoice_source = #{invoiceSource}
         </if>
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
+        <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
+            and t.sn_voucher_number = #{snVoucherNumber}
+        </if>
+        <if test="postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99' and postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+        <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="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="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
+            and (t.comp_code = '' or t.comp_code is null)
+        </if>
     </select>
 
 
@@ -623,54 +659,72 @@
         left JOIN ${dxhyDetail}.t_dx_record_invoice_detail_sales b ON t.uuid = b.uuid
         where t.detail_yesorno = '1'
         <if test="cjksyf != null and cjksyf!= '' and cjjsyf != null and cjjsyf != ''">
-            AND t.create_date BETWEEN #{cjksyf} and #{cjjsyf}
+            AND t.create_date between #{cjksyf} and #{cjjsyf}
         </if>
         <if test="kpksrq != null and kpksrq!= '' and kpjsrq != null and kpjsrq != ''">
             AND t.invoice_date between #{kpksrq} and #{kpjsrq}
         </if>
         <if test="keyWord != null and keyWord != '' and keyWord != 'null' ">
-            and CONCAT(IFNULL(t.invoice_code,''),IFNULL(t.invoice_no,''),IFNULL(t.xf_name,'')) like
+            and CONCAT(IFNULL(t.invoice_code,''),IFNULL(t.invoice_no,''),IFNULL(t.gf_name,''),IFNULL(t.gf_tax_no,''))
+            like
             CONCAT('%',#{keyWord},'%')
         </if>
-        and t.xf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <!--        and t.xf_tax_no in-->
+        <!--        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">-->
+        <!--            #{item}-->
+        <!--        </foreach>-->
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and t.invoice_type = #{invoiceType}
         </if>
-        <if test="fpzt != null and fpzt != '' and fpzt != 'null' and fpzt != '99'">
-            and t.invoice_status = #{fpzt}
+        <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="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '99'">
-            and t.rzh_yesorno = #{rzzt}
-        </if>
-        <if test='rzzt == "99"'>
-            and t.rzh_yesorno in ('1','2','0')
-        </if>
-        <if test="rzlx != null and rzlx != '' and rzlx != 'null' and rzlx != '99'">
-            and t.rzlx = #{rzlx}
-        </if>
-        <if test="skssq != null and skssq != '' and skssq != 'null' ">
-            and t.rzh_belong_date = #{skssq}
-        </if>
         <if test="qsyf != null and qsyf != null and qsyf != '' and qsyf != ''">
             and DATE_FORMAT(t.qs_date,'%Y-%m') = #{qsyf}
         </if>
         <if test="qsr != null and qsr != '' and qsr != 'null' ">
             and t.qs_name like CONCAT(#{qsr},'%')
         </if>
-        <if test="rzr != null and rzr != '' and rzr != 'null' ">
-            and t.confirm_user like CONCAT(#{rzr},'%')
-        </if>
         <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'">
-            and t.payment_status = #{inAccountStatus}
+        <if test="remark != null and remark != '' and remark != 'null' ">
+            and t.remark like CONCAT(#{remark},'%')
+        </if>
+        <if test="listMark != null and listMark != '' and listMark != 'null' and listMark != '99'">
+            and t.list_status = #{listMark}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
+            and t.inaccount_status = #{inAccountStatus}
+        </if>
+        <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
+            and (t.inaccount_status = '' or t.inaccount_status is null or t.inaccount_status = '0')
+        </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 postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
+        </if>
+
+        <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
+            and t.bzdh = #{bzdh}
+        </if>
+
+        <if test="bzr != null and bzr != '' and bzr != 'null'">
+            and t.bzr like concat('%',#{bzr},'%')
+        </if>
+
+        <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
+            and t.account_period = #{accountPeriod}
+        </if>
+
+        <if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
+            and t.image_id = #{imageNumber}
         </if>
         <if test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
             and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}
@@ -678,14 +732,24 @@
         <if test="incentiveFlag !=null and incentiveFlag !='' and incentiveFlag!= '99'">
             and t.incentive_flag like CONCAT('%',#{incentiveFlag},'%')
         </if>
-        <if test="listMark != null and listMark != '' and listMark != 'null' and listMark != '99'">
-            and t.list_status = #{listMark}
-        </if>
-        <if test="remark != null and remark != '' and remark != 'null' ">
-            and t.remark like CONCAT(#{remark},'%')
-        </if>
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
             and t.invoice_source = #{invoiceSource}
         </if>
+        <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="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
+            and (t.comp_code = '' or t.comp_code is null)
+        </if>
+        GROUP BY t.uuid
+        ORDER BY t.create_date DESC
     </select>
 </mapper>
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 43c32c20..28250108 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -102,10 +102,21 @@
         and t.auth_status != '0'
         and t.rzh_yesorno != '0'
         and t.company = #{company}
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <if test="sign !='88'">
+            and t.gf_tax_no in
+            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <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="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
             and t.comp_code = #{companyCode}
@@ -582,10 +593,26 @@
             c.select_end_date or d.tj_status in ('1','2'))
 
         </if>
-        and t.gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        <if test="sign !='88'">
+            and t.gf_tax_no in
+            <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <!--        and t.comp_code in-->
+        <!--        <foreach collection="companyCodes" index="index" item="companyCode" open="(" close=")" separator=",">-->
+        <!--            #{companyCode}-->
+        <!--        </foreach>-->
+        <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="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
             and t.comp_code = #{companyCode}
         </if>