优化智能勾选

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -544,6 +544,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
                         if (collect != null && collect.size() > 0){
                             log.info("从小到大排序在进行添加");
                             for (int j = 0; j < collect.size(); j++) {
+                                if (collect.get(j).getTaxAmount().compareTo(new BigDecimal("0"))<1){
+                                    continue;
+                                }
                                 currentTax = currentTax.add(collect.get(j).getTaxAmount());
                                 hjje = hjje.add(collect.get(j).getInvoiceAmount());
                                 log.info("maxTax====>"+maxTax+",currentTax====>"+currentTax);
@@ -605,7 +608,6 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
         return super.responseResult(json);
     }
 
-    @NotNull
     public BaseSggxCxRespVO getBaseSggxCxRespVO(BaseTDxRecordInvoice baseTDxRecordInvoice, int count, List<String> taxnoList, List<Business> businessList) {
         BaseSggxCxRespVO vo = new BaseSggxCxRespVO();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -1285,7 +1285,7 @@
         and t.export_mark = '0'
         and t.company = #{company}
         and t.invoice_status = '0'
-
+        and t.tax_amount > 0
         and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}