From b983639657068a55e014422712692d5956ace3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 5 Sep 2023 22:47:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml | 4 ++--
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index d38ba5d4..8b498e43 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -354,7 +354,7 @@
             and t.account_period = #{accountPeriod}
         </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
     </select>
     <!--销项票池查询-->
@@ -452,7 +452,7 @@
             and t.invoice_source = #{invoiceSource}
         </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         GROUP BY t.uuid
         ORDER BY t.create_date DESC
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 780b5797..c11cce0b 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -722,6 +722,12 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
+        <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
+            and t.tax_rate = #{taxRate}
+        </if>
+        <if test="taxRate=='多税率'">
+            and t.tax_rate like '%,%'
+        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             order by t.qs_date desc,t.invoice_date desc
         </if>

From 5657df1aa1d38825209242c6b663e1f9607d04c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Tue, 5 Sep 2023 22:54:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=88=B0=E5=A4=84=E6=B7=BB=E5=8A=A0=E7=A8=8E=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java   | 1 +
 .../src/main/java/com/dxhy/core/thread/ManualAthensThread.java | 2 +-
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml             | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

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 9a66e401..ada59470 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
@@ -118,6 +118,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                             dataArray[23] = "否";
                             dataArray[24] = "";
                         }
+                        dataArray[25] = pageList.get(i).getTaxRate();
 
 
 
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 52f49816..a9af7e2f 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
@@ -68,7 +68,7 @@ public class ManualAthensThread extends BaseThread {
      */
     private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
             "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","所属组织"
-    ,"暂挂状态","暂挂区间"};
+    ,"暂挂状态","暂挂区间","税率"};
 
 
     /**
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index c11cce0b..0c566fe5 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -561,6 +561,7 @@
         <result column="suspend_status" property="suspendStatus"/>
         <result column="suspend_date" property="suspendDate"/>
         <result column="comp_code" property="compCode"/>
+        <result column="tax_rate" property="taxRate"/>
     </resultMap>
     <select id="selectByparams"  parameterType="java.util.Map"
             resultMap="SggxcxResultMap" databaseId="mysql">
@@ -570,7 +571,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,t.bzr,t.suspend_status,t.suspend_date,
+        else 2 end authStatus,t.bzdh,t.bzr,t.suspend_status,t.suspend_date,t.tax_rate,
         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

From b2024e375d1304bb958f1789dd6e8e8f4d0cb68f Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 5 Sep 2023 22:54:58 +0800
Subject: [PATCH 3/3] ariesy

---
 dxhy-core/src/main/resources/mapper/SgqsMapper.xml            | 2 +-
 .../service/caution/ExtCautionExpirationServiceImpl.java      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
index f8679aa5..11e72180 100644
--- a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml
@@ -38,7 +38,7 @@
         qs_status = '0' and source_system='0'
         and t.gf_tax_no = #{gfsh}
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and businessCode != '99' ">
-            and comp_code = #{companyCode}
+            and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
         </if>
         <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
             and invoice_type = #{invoiceType}
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
index 3c856b6f..556b1b68 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/caution/ExtCautionExpirationServiceImpl.java
@@ -370,7 +370,9 @@ public class ExtCautionExpirationServiceImpl extends MpBaseServiceImpl<ExtTdxRec
         BigDecimal sumTaxAmount = new BigDecimal(0);
         for (ExtTdxRecordInvoice record : sumList) {
             sumInvoiceAmount = sumInvoiceAmount.add(record.getInvoiceAmount());
-            sumTaxAmount = sumTaxAmount.add(record.getTaxAmount());
+            if(record.getTaxAmount() != null) {
+                sumTaxAmount = sumTaxAmount.add(record.getTaxAmount());
+            }
         }
         result.put("sumInvoiceAmount",
             AmountFormatUtil.fmtMicrometer(MathUtil.round(sumInvoiceAmount.toPlainString())));