From 59257504fb3cc277fa59e9878a3ac0630097cb7d Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 17 May 2023 15:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=92=8C=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

---
 .../java/com/dxhy/core/dao/PoolPaperDao.java  |  2 +
 .../export/impl/PoolPaperServiceImpl.java     | 80 +++++++++----------
 .../export/impl/TicketServiceImpl.java        |  2 +-
 .../dxhy/core/thread/PoolAddTaxThread.java    |  2 +-
 .../com/dxhy/core/thread/PoolOtherThread.java |  1 +
 .../com/dxhy/core/thread/PoolSaleThread.java  |  2 +-
 .../main/resources/mapper/ExtPaperMapper.xml  | 51 ++++++++++++
 7 files changed, 94 insertions(+), 46 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/PoolPaperDao.java b/dxhy-core/src/main/java/com/dxhy/core/dao/PoolPaperDao.java
index 8b721ad9..aa51fc3e 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/dao/PoolPaperDao.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/dao/PoolPaperDao.java
@@ -95,4 +95,6 @@ public interface PoolPaperDao extends BaseMapper<InvoicePaperEntity> {
      * @return
      */
     List<CompanyPoolJxVO> listSaleInvoiceDetail(Map<String, Object> pramsMap);
+
+    long selectCountByParamsMap(Map<String, Object> pramsMap);
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java
index cb1ebd67..85e5a25c 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/PoolPaperServiceImpl.java
@@ -164,7 +164,7 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
                     dataArray[16] = pageList.get(i).getBzdh();
                     if(pageList.get(i).getInAccountStatus() != null && "1".equals(pageList.get(i).getInAccountStatus())){
                         dataArray[17] = "已入账";
-                    }else if (pageList.get(i).getInAccountStatus() != null && "0".equals(pageList.get(i).getInAccountStatus())){
+                    }else {
                         dataArray[17] = "未入账";
                     }
 
@@ -283,49 +283,50 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
                     dataArray[22] = pageList.get(i).getQsrq() != null ? pageList.get(i).getQsrq() : "";
                     dataArray[23] = pageList.get(i).getQsr();
                     dataArray[24] = pageList.get(i).getInAccountMonth();
-                    if ("0".equals(pageList.get(i).getInAccountStatus())) {
-                        dataArray[25] = "未入账";
-                    } else if ("1".equals(pageList.get(i).getInAccountStatus())) {
-                        dataArray[25] = "已入账";
-                    } else {
-                        dataArray[25] = "未入账";
-                    }
-                    dataArray[26] = pageList.get(i).getVoucherNo();
+//                    if ("0".equals(pageList.get(i).getInAccountStatus())) {
+//                        dataArray[25] = "未入账";
+//                    } else if ("1".equals(pageList.get(i).getInAccountStatus())) {
+//                        dataArray[25] = "已入账";
+//                    }
+//                    else {
+//                        dataArray[25] = "未入账";
+//                    }
+                    dataArray[25] = pageList.get(i).getVoucherNo();
                     if ("0".equals(pageList.get(i).getAmortizeStatus())) {
-                        dataArray[27] = "否";
+                        dataArray[26] = "否";
                     } else if ("1".equals(pageList.get(i).getAmortizeStatus())) {
-                        dataArray[27] = "是";
+                        dataArray[26] = "是";
                     } else {
-                        dataArray[27] = "";
+                        dataArray[26] = "";
                     }
                     if (pageList.get(i).getAmortizeAmount() != null
                         && !"".equals(pageList.get(i).getAmortizeAmount())) {
-                        dataArray[28] =
+                        dataArray[27] =
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getAmortizeAmount()));
                     } else {
-                        dataArray[28] = "";
+                        dataArray[27] = "";
                     }
                     if (pageList.get(i).getRemainAmortizeAmount() != null
                         && !"".equals(pageList.get(i).getRemainAmortizeAmount())) {
-                        dataArray[29] =
+                        dataArray[28] =
                             AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getRemainAmortizeAmount()));
                     } else {
-                        dataArray[29] = "";
+                        dataArray[28] = "";
                     }
 
-                    dataArray[30] = pageList.get(i).getDocumentNumber();
-                    dataArray[31] = pageList.get(i).getCreateDate();
-                    dataArray[32] = pageList.get(i).getSnVoucherNumber();
-                    dataArray[33] = pageList.get(i).getPostingTime();
-                    dataArray[34] = pageList.get(i).getAccountPeriod();
-                    dataArray[35] = pageList.get(i).getImageId();
-                    dataArray[36] = pageList.get(i).getBzdh();
+                    dataArray[29] = pageList.get(i).getDocumentNumber();
+                    dataArray[30] = pageList.get(i).getCreateDate();
+                    dataArray[31] = pageList.get(i).getSnVoucherNumber();
+                    dataArray[32] = pageList.get(i).getPostingTime();
+                    dataArray[33] = pageList.get(i).getAccountPeriod();
+                    dataArray[34] = pageList.get(i).getImageId();
+                    dataArray[35] = pageList.get(i).getBzdh();
                     if (pageList.get(i).getInAccountStatus() != null && "1".equals(pageList.get(i).getInAccountStatus())){
-                        dataArray[37] = "已入账";
-                    }else if (pageList.get(i).getInAccountStatus() != null && "0".equals(pageList.get(i).getInAccountStatus())){
-                        dataArray[37] = "未入账";
+                        dataArray[36] = "已入账";
+                    }else {
+                        dataArray[36] = "未入账";
                     }
-                    dataArray[38] = pageList.get(i).getCompCode();
+                    dataArray[37] = pageList.get(i).getCompCode();
                     returnList.add(dataArray);
                 }
             }
@@ -411,23 +412,16 @@ public class PoolPaperServiceImpl extends MpBaseServiceImpl<PoolPaperDao, Invoic
                     dataArray[20] = pageList.get(i).getQsrq() != null ? pageList.get(i).getQsrq() : "";
                     dataArray[21] = pageList.get(i).getQsr();
                     dataArray[22] = pageList.get(i).getInAccountMonth();
-                    if ("0".equals(pageList.get(i).getInAccountStatus())) {
-                        dataArray[23] = "未入账";
-                    } else if ("1".equals(pageList.get(i).getInAccountStatus())) {
-                        dataArray[23] = "已入账";
-                    } else {
-                        dataArray[23] = "";
-                    }
-                    dataArray[24] = pageList.get(i).getVoucherNo();
-                    dataArray[25] = pageList.get(i).getDocumentNumber();
-                    dataArray[26] = pageList.get(i).getCreateDate();
-                    dataArray[27] = pageList.get(i).getBzdh();
-                    if (pageList.get(i).getInAccountStatus() != null && "1".equals(pageList.get(i).getInAccountStatus())){
-                        dataArray[28] = "已入账";
-                    }else if (pageList.get(i).getInAccountStatus() != null && "0".equals(pageList.get(i).getInAccountStatus())){
-                        dataArray[28] = "未入账";
+                    dataArray[23] = pageList.get(i).getSnVoucherNumber();
+                    dataArray[24] = pageList.get(i).getDocumentNumber();
+                    dataArray[25] = pageList.get(i).getCreateDate();
+                    dataArray[26] = pageList.get(i).getBzdh();
+                    if ("1".equals(pageList.get(i).getInAccountStatus())) {
+                        dataArray[27] = "已入账";
+                    } else{
+                        dataArray[27] = "未入账";
                     }
-                    dataArray[29] = pageList.get(i).getCompCode();
+                    dataArray[28] = pageList.get(i).getCompCode();
                     returnList.add(dataArray);
                 }
             }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java
index 922db438..2b114977 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/TicketServiceImpl.java
@@ -189,7 +189,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl<TicketDao, TicketInvoic
                 dataArray[23] = resultList.get(i).getBzdh();
                 if (pageList.get(i).getInAccountStatus() != null && "1".equals(pageList.get(i).getInAccountStatus())){
                     dataArray[24] = "已入账";
-                }else if (pageList.get(i).getInAccountStatus() != null && "0".equals(pageList.get(i).getInAccountStatus())){
+                }else {
                     dataArray[24] = "未入账";
                 }
                 dataArray[25] = resultList.get(i).getCompCode();
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
index 5b017882..4dd7ca66 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
@@ -68,7 +68,7 @@ public class PoolAddTaxThread extends BaseThread {
      */
     private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额",
             "有效税额", "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
-        "入账月份", "入账状态", "凭证号", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","过账时间","账期","影像id","报账单号","入账状态","所属组织"};
+        "入账月份","凭证号", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","过账时间","账期","影像id","报账单号","入账状态","所属组织"};
 
     /**
      * 导出excel的列名
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
index bad300dc..4ec66616 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
@@ -246,6 +246,7 @@ public class PoolOtherThread extends BaseThread {
         if (curr == default_curr) {
             firstPage = true;
         }
+        title = "其他票据";
 
         // 数据不是最后一页
         if (hasNext) {
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
index 8fc49e4a..83b23eca 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
@@ -72,7 +72,7 @@ public class PoolSaleThread extends BaseThread {
      */
     private final String[] titleColumns =
         {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "购方名称", "购方税号", "金额", "税额", "价税合计", "清单标志", "备注", "优惠政策类型",
-            "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "业务单号", "入池时间","报账单号","入账状态","所属组织"};
+            "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份", "凭证号", "业务单号", "入池时间","报账单号","入账状态","所属组织"};
 
     /**
      * 导出excel的列名
diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index 4635d17c..b7c889bc 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -152,6 +152,56 @@
         GROUP BY uuid having min(create_date)
         ORDER BY create_date DESC
     </select>
+<!--    其他发票数量-->
+    <select id="selectCountByParamsMap" parameterType="java.util.Map"
+            resultType="com.dxhy.core.entity.ExtOtherInvoice" databaseId="mysql">
+        SELECT count(*)
+        FROM
+        t_dx_invoice_reimburse
+        where invoice_type in
+        ('91','94','95','00','97','98','101','102','103','99')
+        <if test="cjksyf != null and cjksyf!= '' and cjjsyf != null and cjjsyf != ''">
+            AND create_date between #{cjksyf} and #{cjjsyf}
+        </if>
+        <if test="kpksrq != null and kpksrq!= '' and kpjsrq != null and kpjsrq != ''">
+            AND invoice_date between #{kpksrq} and #{kpjsrq}
+        </if>
+        <if test="keyWord != null and keyWord != '' and keyWord != 'null' ">
+            AND CONCAT(IFNULL(invoice_code,''),IFNULL(invoice_no,'')) like CONCAT('%',#{keyWord},'%')
+        </if>
+
+        <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '999' ">
+            and invoice_type = #{invoiceType}
+        </if>
+        <if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
+            and qs_status = #{qszt}
+        </if>
+        <if test="qsyf != null and qsyf != null and qsyf != '' and qsyf != ''">
+            and DATE_FORMAT(qs_date,'%Y-%m') = #{qsyf}
+        </if>
+        <if test="qsr != null and qsr != '' and qsr != 'null' ">
+            and qs_name like CONCAT(#{qsr},'%')
+        </if>
+        <if test="qsfs != null and qsfs != '' and qsfs != 'null' and qsfs != '99'">
+            and qs_type = #{qsfs}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
+            and (comp_code in
+            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
+                #{companyCode}
+            </foreach>
+            or comp_code is null or comp_code = ''
+            )
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
+            and comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
+            and (comp_code is null or comp_code = '')
+        </if>
+        GROUP BY uuid having min(create_date)
+        ORDER BY create_date DESC
+    </select>
     <!--增值税票-->
     <select id="listAddTaxInvoice" parameterType="java.util.Map"
             resultType="com.dxhy.core.entity.ExtAddTaxInvoice" databaseId="mysql">
@@ -292,6 +342,7 @@
         select
         <include refid="sql_fields_added"/>
         ,t.incentive_flag incentiveFlag
+        ,t.sn_voucher_number snVoucherNumber
         ,t.system_name systemName
         ,t.bzdh
         ,t.inaccount_status inAccountStatus