luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大票综合查询导出

Browse Source
release
yishiqihuasheng 2 years ago
parent 76dea7bb96
commit 7caf90bc3d
8 changed files with 92 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
  2. 10
      dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
  3. 16
      dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
  4. 13
      dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
  5. 16
      dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
  6. 10
      dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
  7. 4
      dxhy-core/src/main/resources/mapper/CustomsMapper.xml
  8. 11
      dxhy-extend/src/main/resources/mapper/CustomsMapper.xml

18
dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java
Unescape View File

@ -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<String> 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<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {

10
dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
Unescape View File

@ -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<String> companyCodes = companyCodeArray.toJavaList(String.class);
// 参数转换为需要的形式
Map<String, Object> 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<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);

16
dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
Unescape View File

@ -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<String> companyCodes = companyCodeArray.toJavaList(String.class);
// 参数转换为需要的形式
Map<String, Object> 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<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);

13
dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
Unescape View File

@ -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<String, Object> 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<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);

16
dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
Unescape View File

@ -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<String> companyCodes = companyCodeArray.toJavaList(String.class);
// 参数转换为需要的形式
Map<String, Object> 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<String> gfshList = new ArrayList<>();
if (!StringHelper.isBlank(gfsh)) {
gfshList = StringHelper.stringToList(gfsh);

10
dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java
Unescape View File

@ -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<String> companyCodes = companyCodeArray.toJavaList(String.class);
JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId);
List<Business> businesses = (List<Business>)prams.get("userBusiness");
// 参数转换为需要的形式
Map<String, Object> 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);

4
dxhy-core/src/main/resources/mapper/CustomsMapper.xml
Unescape View File

@ -124,10 +124,10 @@
and t.rzh_type = #{rzhType}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
and t.in_account_status = #{inAccountStatus}
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
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)
</if>
<if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
and t.qs_type = #{qsfs}

11
dxhy-extend/src/main/resources/mapper/CustomsMapper.xml
Unescape View File

@ -126,10 +126,10 @@
and t.rzh_type = #{rzhType}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
and t.in_account_status = #{inAccountStatus}
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
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)
</if>
<if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
and t.qs_type = #{qsfs}
@ -247,8 +247,11 @@
<if test="rzhType != null and rzhType != '' and rzhType != 'null' ">
and t.rzh_type = #{rzhType}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' ">
and t.in_account_status = #{inAccountStatus}
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '0'.toString()">
and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null)
</if>
<if test="qsfs != null and qsfs != '' and qsfs != 'null' ">
and t.qs_type = #{qsfs}

Write Preview
Loading…
Cancel
Save