From 9db2db38289387c3feab23b98d1cfa484982a9b0 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 6 Jun 2023 10:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseRzTDxRecordInvoiceServiceImpl.java               | 9 +++++++--
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
index 5934a0b2..c6477147 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java
@@ -416,8 +416,13 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
         BaseTDxRecordInvoice hjxx = hjList.get(0);
         hjsl = hjxx.getSfygx();
         if (!"0".equals(hjsl)) {
-            hjje = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getInvoiceAmount().toPlainString()));
-            hjse = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getTaxAmount().toPlainString()));
+            if (hjxx.getInvoiceAmount() != null ){
+                hjje = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getInvoiceAmount().toPlainString()));
+            }
+
+            if (hjxx.getTaxAmount() != null){
+                hjse = AmountFormatUtil.fmtMicrometer(MathUtil.round(hjxx.getTaxAmount().toPlainString()));
+            }
         }
         json.put("hjsl", AmountFormatUtil.fmtMicrometer(hjsl));
         json.put("hjje", hjje);
diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index 1a0f93ea..f7ec90b3 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -1251,7 +1251,10 @@
     </select>
     <select id="selectRzhAllHj" parameterType="java.util.Map"
             resultMap="hjResultMap" databaseId="mysql">
-        select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.dk_tax_amount)hjse
+        select count(1) hjsl,sum(t.invoice_amount)hjje,sum(
+            case
+            when t.dk_tax_amount is null then t.tax_amount
+            else t.dk_tax_amount end )hjse
         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
         WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}