diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index 258fc5ea..3b90e0e4 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -181,6 +181,12 @@ public class PoolAddTaxThread extends BaseThread { } else { pramsMap.put("gfsh", gfshList); } + boolean flag = checkList(gfshList); + if (flag){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); + } + if (cjksyf != null && !"".equals(cjksyf)) { pramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(cjksyf))); } @@ -468,4 +474,22 @@ public class PoolAddTaxThread extends BaseThread { return filePath.toString(); } + public boolean checkList(List list) { + boolean flag =false; + if (list == null || list.isEmpty()){ + flag = true; + }else { + String s = list.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } + } + return flag; + } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java index d0f6b017..5020384b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java @@ -186,6 +186,11 @@ public class PoolSaleThread extends BaseThread { } else { pramsMap.put("gfsh", gfshList); } + boolean flag = checkList(gfshList); + if (flag){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); + } if (cjksyf != null && !"".equals(cjksyf)) { pramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(cjksyf))); } @@ -468,4 +473,22 @@ public class PoolSaleThread extends BaseThread { return filePath.toString(); } + public boolean checkList(List list) { + boolean flag =false; + if (list == null || list.isEmpty()){ + flag = true; + }else { + String s = list.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } + } + return flag; + } } diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml index 51265a5a..07b88854 100644 --- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml @@ -293,10 +293,13 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + and t.gf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -400,10 +403,13 @@ like CONCAT('%',#{keyWord},'%') - and t.xf_tax_no in - - #{item} - + + and t.xf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -559,10 +565,13 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + and t.gf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -669,10 +678,13 @@ like CONCAT('%',#{keyWord},'%') - and t.xf_tax_no in - - #{item} - + + and t.xf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType}