From 0ff56d5fa043d901ac4af5f55787dbe2f09a9384 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Wed, 10 May 2023 10:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/extend/entity/ExtOtherInvoice.java   |  1 +
 .../pool/ExtInvoicePoolServiceImpl.java       |  4 ++--
 .../resources/mapper/ExtInvoicePoolMapper.xml | 23 +++++++++++++++----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
index c9ad1d03..47e9ec2e 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
@@ -71,4 +71,5 @@ public class ExtOtherInvoice implements Serializable {
     private String inAccountStatus;
     private String bzdh;
     private String snVoucherNumber;
+    private String compCode;
 }
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
index 977abb1e..ac23168e 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
@@ -217,10 +217,10 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
         try {
             String[] titlelist =
                 {"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号"
-                        , "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态"};
+                        , "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态","所属组织"};
             String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "invoiceAmount",
                 "qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate","snVoucherNumber", "postingTime",
-                    "imageNumber","accountPeriod","bzdh","inAccountStatus"};
+                    "imageNumber","accountPeriod","bzdh","inAccountStatus","compCode"};
             // 需要设置返回列表标题时调用
             json = super.setTitleList(titlelist, titleprop);
             PageHelper.startPage(curr, size);
diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
index c67ce42c..c22a7733 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
@@ -279,10 +279,10 @@
         <if test="keyWord != null and keyWord != '' and keyWord != 'null' ">
             AND CONCAT(IFNULL(invoice_code,''),IFNULL(invoice_no,'')) like CONCAT('%',#{keyWord},'%')
         </if>
-        AND gf_tax_no in
-        <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+<!--        AND 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 != '999' ">
             AND invoice_type = #{invoiceType}
@@ -317,6 +317,12 @@
         <if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
             and sn_voucher_number = #{snVoucherNumber}
         </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) ) t
     </select>
     <select id="listOtherInvoice" parameterType="java.util.Map"
@@ -341,7 +347,8 @@
         posting_time postingTime,
         inaccount_status inAccountStatus,
         bzdh bzdh,
-        sn_voucher_number snVoucherNumber
+        sn_voucher_number snVoucherNumber,
+        comp_code compCode
         FROM
         t_dx_invoice_reimburse
         where invoice_type in
@@ -396,6 +403,12 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
             and bzdh = #{bzdh}
         </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>