From e5cc8f1561572aed38e956231a57f51ad71c5ab6 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 1 Jun 2023 11:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=85=A5=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=9C=AA=E8=BF=94=E5=9B=9E=E6=8A=B5=E6=89=A3=E7=A8=8E?=
 =?UTF-8?q?=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java     | 5 +++++
 dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java
index ad822584..5b7f9c5f 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java
@@ -81,12 +81,14 @@ public class BaseFpdrrzServiceImpl extends MpBaseServiceImpl<BaseFpdrrzDao, Base
             String fphm = jsonObject.getString("invoiceNo");
             String kprq = jsonObject.getString("invoiceDate");
             String se = jsonObject.getString("taxAmount");
+            String dkse1 = jsonObject.getString("taxAmount");
             BaseFpdrrzRespVO rzlb = new BaseFpdrrzRespVO();
             rzlb.setSelect(true);
             rzlb.setXh(String.valueOf(i + 1));
             rzlb.setBkrzts("");
             rzlb.setFpdm(fpdm);
             rzlb.setFphm(fphm);
+            rzlb.setDkse(dkse1);
             if (fphm.length() == 20) {
                 rzlb.setFpdm(fphm.substring(0, 12));
                 rzlb.setFphm(fphm.substring(12, 20));
@@ -144,6 +146,9 @@ public class BaseFpdrrzServiceImpl extends MpBaseServiceImpl<BaseFpdrrzDao, Base
             QueryWrapper<BaseTDxRecordInvoice> queryRecord = new QueryWrapper<>();
             queryRecord.eq("uuid", uuid);
             BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord);
+            if (StringHelper.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){
+                rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString());
+            }
             if (rdxRecordInvoice != null) {
                 if (list == null || list.size() == 0 || !list.contains(rdxRecordInvoice.getGfTaxNo())) {
                     rzlb.setBkrzts("无该发票购方税号权限");
diff --git a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml
index 68504cc7..8b883a47 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml
@@ -13,7 +13,7 @@
         select count(1) totalCount, ifnull(sum(invoice_amount), 0) totalAmount,
         ifnull(sum(dk_tax_amount), 0) totalTax
         FROM t_dx_record_invoice
-        WHERE valid='1' and invoice_type in ('01','03','08','14') AND invoice_status='0' AND
+        WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND
         rzh_yesorno='1'
         <if test="skssq !=null and skssq != ''">
             and rzh_belong_date = #{skssq}
@@ -54,7 +54,7 @@
 
     <select id="getTotalOutTax" resultType="Double" databaseId="mysql">
         SELECT ifnull(sum(out_tax_amount), 0) FROM t_dx_record_invoice
-        WHERE valid='1' and invoice_type in ('01','03','08','14') AND invoice_status='0' AND
+        WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND
         rzh_yesorno='1' AND
         out_status in ('1','2')
         <if test="skssq !=null and skssq != ''">
@@ -69,7 +69,7 @@
         out_reason rzhDate,
         ifnull(sum(out_tax_amount), 0) tax
         FROM t_dx_record_invoice
-        WHERE valid='1' and invoice_type in ('01','03','08','14') AND invoice_status='0' AND
+        WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND
         rzh_yesorno='1' AND
         out_status in ('1','2')
         <if test="skssq !=null and skssq != ''">