diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java index cf01e457..cd3536dd 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java @@ -2,6 +2,7 @@ package com.dxhy.core.thread; import java.util.*; +import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.impl.TabulateRedisServiceImpl; @@ -146,6 +147,16 @@ public class CustomExportThread extends BaseThread { String menuId = prams.getString("menuId"); String bzdh = prams.getString("bzdh"); String bzr = prams.getString("bzr"); + String inAccountStatus = prams.getString("inAccountStatus"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); List companyCodes = companyCodeArray.toJavaList(String.class); @@ -159,6 +170,13 @@ public class CustomExportThread extends BaseThread { pramsMap.put("companyCodes",companyCodes); pramsMap.put("bzdh",bzdh); pramsMap.put("bzr",bzr); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); + List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java index 10d6b81b..a45e730a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java @@ -155,6 +155,11 @@ public class ManualAthensThread extends BaseThread { String inAccountStatus = prams.getString("inAccountStatus"); String inAccountMonth = prams.getString("inAccountMonth"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); @@ -164,6 +169,11 @@ public class ManualAthensThread extends BaseThread { pramsMap.put("businessCode",businessCode); pramsMap.put("suspendStatus",suspendStatus); pramsMap.put("suspendDate",suspendDate); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); 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 1156ea3b..34456091 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 @@ -152,12 +152,28 @@ public class PoolAddTaxThread extends BaseThread { String bzr = prams.getString("bzr"); String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); pramsMap.put("bzdh",bzdh); pramsMap.put("bzr",bzr); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); + List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java index 281837e5..a08b9f12 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java @@ -124,12 +124,25 @@ public class PoolOtherThread extends BaseThread { String bzr = prams.getString("bzr"); String bzdh = prams.getString("bzdh"); String inAccountStatus = prams.getString("inAccountStatus"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); pramsMap.put("bzr",bzr); pramsMap.put("bzdh",bzdh); pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); 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 67313a8f..00bc2ddd 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 @@ -157,12 +157,28 @@ public class PoolSaleThread extends BaseThread { String company = prams.getString("company"); String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); pramsMap.put("bzdh",bzdh); pramsMap.put("bzr",bzr); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); + List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java index e9dfbde5..b386f99c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java @@ -141,12 +141,22 @@ public class RzFpxxExportThread extends BaseThread { String bzdh = prams.getString("bzdh"); String bzr = prams.getString("bzr"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); List businesses = (List)prams.get("userBusiness"); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(30); pramsMap.put("dbName", dbName); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); pramsMap.put("business", businesses); pramsMap.put("businessCode",businessCode); pramsMap.put("qsr",qsr); diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml index 7177b273..41a72c9a 100644 --- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml @@ -124,10 +124,10 @@ and t.rzh_type = #{rzhType} - and t.in_account_status = #{inAccountStatus} + and t.inaccount_status = #{inAccountStatus} - and (t.in_account_status = '0' or t.in_account_status = '' or t.in_account_status is null) + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_type = #{qsfs} diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml index 8e391017..4d0407e5 100644 --- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml @@ -126,10 +126,10 @@ and t.rzh_type = #{rzhType} - and t.in_account_status = #{inAccountStatus} + and t.inaccount_status = #{inAccountStatus} - and (t.in_account_status = '0' or t.in_account_status = '' or t.in_account_status is null) + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_type = #{qsfs} @@ -247,8 +247,11 @@ and t.rzh_type = #{rzhType} - - and t.in_account_status = #{inAccountStatus} + + and t.inaccount_status = #{inAccountStatus} + + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_type = #{qsfs}