|
|
|
@ -1,6 +1,7 @@ |
|
|
|
|
package com.dxhy.core.thread; |
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
|
import com.alibaba.fastjson.JSONArray; |
|
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
import com.dxhy.common.service.impl.TabulateRedisServiceImpl; |
|
|
|
|
import com.dxhy.common.util.ExcelPoiUtil; |
|
|
|
@ -141,6 +142,9 @@ public class FpzhcxExportThread extends BaseThread { |
|
|
|
|
String imageNumber = prams.getString("imageNumber"); |
|
|
|
|
String inAccountStatus = prams.getString("inAccountStatus"); |
|
|
|
|
String snVoucherNumber =prams.getString("snVoucherNumber"); |
|
|
|
|
String companyCode = prams.getString("companyCode"); |
|
|
|
|
JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); |
|
|
|
|
List<String> companyCodes = companyCodeArray.toJavaList(String.class); |
|
|
|
|
String accountPeriod = prams.getString("accountPeriod"); |
|
|
|
|
if (org.apache.commons.lang3.StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ |
|
|
|
|
accountPeriod = accountPeriod.substring(0,7); |
|
|
|
@ -236,6 +240,8 @@ public class FpzhcxExportThread extends BaseThread { |
|
|
|
|
pramsMap.put("taxAmountMax", prams.getString("taxAmountMax")); |
|
|
|
|
pramsMap.put("settlementNo", prams.getString("settlementNo")); |
|
|
|
|
pramsMap.put("voucherNumber", prams.getString("voucherNumber")); |
|
|
|
|
pramsMap.put("companyCodes",companyCodes); |
|
|
|
|
pramsMap.put("companyCode",companyCode); |
|
|
|
|
if (!StringHelper.isBlank(rzlx) && !"99".equals(rzlx)) { |
|
|
|
|
pramsMap.put("rzlx", rzlx); |
|
|
|
|
} |
|
|
|
|