修改查询条件

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);

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}