Merge remote-tracking branch 'origin/0803-add_column' into 0803-add_column

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}

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