From 2fa31d607ca3f428cf675873f133bae7181f25ac Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Mon, 22 May 2023 16:06:48 +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

---
 .../java/com/dxhy/core/model/FpRzRespVO.java  |   2 +
 .../export/impl/RzFpxxServiceImpl.java        |   3 +-
 .../dxhy/core/thread/ManualAthensThread.java  |  10 +-
 .../dxhy/core/thread/RzFpxxExportThread.java  |   9 +-
 .../src/main/resources/mapper/FpZhMapper.xml  | 107 +++++++++++++-----
 5 files changed, 95 insertions(+), 36 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
index a990e26a..52199b45 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/FpRzRespVO.java
@@ -223,4 +223,6 @@ public class FpRzRespVO implements Serializable {
     private String postingTime;
 
     private String accountPeriod;
+
+    private String bzr;
 }
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 26a05d58..f421f90c 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
@@ -95,7 +95,8 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         dataArray[17] = pageList.get(i).getImageNumber();
                         dataArray[18] = pageList.get(i).getAccountPeriod();
                         dataArray[19] = pageList.get(i).getBzdh();
-                        dataArray[20] = pageList.get(i).getCompCode();
+                        dataArray[20] = pageList.get(i).getBzr();
+                        dataArray[21] = pageList.get(i).getCompCode();
 
                         returnList.add(dataArray);
                     }
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 8c618d54..d642dc7c 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
@@ -66,13 +66,9 @@ public class ManualAthensThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
-            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "所属组织"};
+            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","所属组织"};
+
 
-    /**
-     * 导出excel的列名
-     */
-    private final String[] detailTitleColumns =
-            {"序号", "发票代码", "发票号码", "货物或应税劳务名称", "规格型号", "单位", "数量", "单价", "金额", "税额", "税率", "车牌号", "类型", "通行日期起", "通行日期止"};
 
     //    private Sheet sheet;
 //    private Table table;
@@ -146,6 +142,7 @@ public class ManualAthensThread extends BaseThread {
                 String cjksyf = prams.getString("cjksyf");
                 String cjjsyf = prams.getString("cjjsyf");
                 String gfTaxNo = prams.getString("gfTaxNo");
+                String bzr = prams.getString("bzr");
                 String inAccountStatus = prams.getString("inAccountStatus");
                 String inAccountMonth = prams.getString("inAccountMonth");
                 JSONArray companyCodeArray = prams.getJSONArray("companyCodes");
@@ -153,6 +150,7 @@ public class ManualAthensThread extends BaseThread {
                 // 参数转换为需要的形式
                 Map<String, Object> pramsMap = new HashMap<>(16);
                 pramsMap.put("dbName", dbName);
+                pramsMap.put("bzr",bzr);
                 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 e24c9531..30659e62 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
@@ -59,7 +59,8 @@ public class RzFpxxExportThread extends BaseThread {
      */
     private String[] titleColumns =
         {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额", "抵扣税额", "发票状态", "签收状态",
-            "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","报账单号","入账状态","所属组织"};
+            "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态",
+                "业务单元","报账单号","报账人","入账状态","所属组织"};
 
     private final IExcelExportlogService exportLogService;
 
@@ -133,6 +134,8 @@ public class RzFpxxExportThread extends BaseThread {
                 String company = prams.getString("company");
                 String menuId = prams.getString("menuId");
                 String companyCode = prams.getString("companyCode");
+                String bzdh = prams.getString("bzdh");
+                String bzr = prams.getString("bzr");
                 JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId);
                 List<Business> businesses = (List<Business>)prams.get("userBusiness");
                 String inAccountStatus = prams.getString("inAccountStatus");
@@ -145,6 +148,8 @@ public class RzFpxxExportThread extends BaseThread {
                 pramsMap.put("paymentDateEnd", prams.getString("paymentDateEnd"));
                 pramsMap.put("paymentStatus", prams.getString("paymentStatus"));
                 pramsMap.put("voucherNumber", prams.getString("voucherNumber"));
+                pramsMap.put("bzdh",bzdh);
+                pramsMap.put("bzr",bzr);
 
                 List<String> gfshList = new ArrayList<>();
                 if (!StringHelper.isBlank(gfsh)) {
@@ -234,7 +239,7 @@ public class RzFpxxExportThread extends BaseThread {
                 if (StringUtils.isNotBlank(inAccountStatus)) {
                     titleColumns = new String[] {"序号", "打款状态", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称",
                         "销方税号", "金额", "税额", "抵扣税额", "发票状态", "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态",
-                        "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","报账单号","入账状态","所属组织"};
+                        "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","报账单号","报账人","入账状态","所属组织"};
                 }
                 if ("1".equals(prams.getString("payment"))) {
                     titleColumns = new String[] {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称", "销方税号",
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 012f5cbd..aa1f1f01 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -100,47 +100,71 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
-        <if
-                test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99' ">
+        <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' ">
             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' and qsfs != '99'">
+        <if test="qsfs != null and qsfs != '' and qsfs != 'null'">
             and t.qs_type = #{qsfs}
         </if>
-        <if
-                test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
+        <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'">
             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="rzzt != null and rzzt != '' and rzzt != 'null'  and rzzt != '99'">
-            and t.rzh_yesorno = #{rzzt}
+        <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="rzclzt != null and rzclzt != '' and rzclzt != 'null'  and rzclzt != '99'">
-            and t.auth_status = #{rzclzt}
+        <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="paymentDateStart != null and paymentDateStart != '' and paymentDateStart != 'null' ">
-            <![CDATA[ AND date_format(t.payment_date,'%Y-%m-%d') >= #{paymentDateStart} ]]>
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '3'">
+            and t.rzh_yesorno = #{rzzt}
         </if>
-        <if test="paymentDateEnd != null and paymentDateEnd != '' and paymentDateEnd != 'null' ">
-            <![CDATA[ AND date_format(t.payment_date,'%Y-%m-%d')  <= #{paymentDateEnd} ]]>
+        <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt == '3'">
+            and (t.rzh_yesorno = '1' or t.rzh_yesorno = '2')
         </if>
-        <if test="paymentStatus != null and paymentStatus != '' and paymentStatus != '99'">
-            and t.payment_status = #{paymentStatus}
+        <if test="imageId != null and imageId != '' and imageId != 'null' ">
+            and t.image_id = #{imageId}
         </if>
-        <if test="rzlx !=null and rzlx != ''">
+        <if test="rzclzt !=null and rzclzt != ''">
+            and t.auth_status = #{rzclzt}
+        </if>
+        <if test="rzlx!=null and rzlx!=''">
             and t.bdk_status = #{rzlx}
         </if>
-        <if
-                test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
+        <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>
+        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '14' ">
             and t.invoice_type = #{invoiceType}
         </if>
         <if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='null' and invoiceSource!='99'">
@@ -149,8 +173,15 @@
         <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},'%')
+            and t.xf_name like concat(#{xfmc},'%')
+        </if>
+        <if test="qsr != null and qsr != '' and qsr != 'null' ">
+            and t.qs_name = #{qsr}
         </if>
         <if test="rzhr != null and rzhr != '' and rzhr != 'null' ">
             and t.confirm_user in
@@ -159,13 +190,25 @@
             </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}
@@ -180,14 +223,20 @@
             </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 postingTimeEnd != null and postingTimeStart != '' and postingTimeEnd != ''">
+            and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
         </if>
-        <if test="qsr != null and qsr != '' and qsr != 'null' ">
-            and t.qs_name = #{qsr}
+        <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.rzh_date desc,t.invoice_date desc
     </select>
@@ -485,6 +534,7 @@
         <result column="account_period" property="accountPeriod"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
         <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
         <result column="comp_code" property="compCode"/>
     </resultMap>
     <select id="selectByparams"  parameterType="java.util.Map"
@@ -495,7 +545,7 @@
         ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,
         case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
         true then 1
-        else 2 end authStatus,t.bzdh,
+        else 2 end authStatus,t.bzdh,t.bzr,
         t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no
         from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
         left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
@@ -536,6 +586,9 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             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>