diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java index 4ec80193..0994ac39 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpzhcxServiceImpl.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; -import javax.sound.sampled.DataLine; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -44,8 +43,8 @@ public class FpzhcxServiceImpl extends MpBaseServiceImpl gfshList = (List)pramsMap.get("gfsh"); - if (gfshList.size() == 0) { + String gfsh = (String) pramsMap.get("gfsh"); + if (StringUtils.isBlank(gfsh)) { // 未从getUserInfo()获取到购方税号信息 json.put("hjsl", "0"); json.put("hjje", "0"); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxExportThread.java index 68c85365..1378c086 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/FpzhcxExportThread.java @@ -143,8 +143,8 @@ public class FpzhcxExportThread extends BaseThread { String inAccountStatus = prams.getString("inAccountStatus"); String snVoucherNumber =prams.getString("snVoucherNumber"); String companyCode = prams.getString("companyCode"); - JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); - List companyCodes = companyCodeArray.toJavaList(String.class); +// JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); +// List 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); @@ -154,6 +154,7 @@ public class FpzhcxExportThread extends BaseThread { JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(30); + pramsMap.put("gfsh",gfsh); pramsMap.put("dbName", dbName); pramsMap.put("business", businesses); pramsMap.put("bzr",bzr); @@ -165,13 +166,13 @@ public class FpzhcxExportThread extends BaseThread { pramsMap.put("postingTimeStart",postingTimeStart); pramsMap.put("accountPeriod",accountPeriod); - List gfshList = new ArrayList<>(); - if (!StringHelper.isBlank(gfsh)) { - gfshList = StringHelper.stringToList(gfsh); - pramsMap.put("gfsh", gfshList); - } else { - pramsMap.put("gfsh", gfshList); - } +// List gfshList = new ArrayList<>(); +// if (!StringHelper.isBlank(gfsh)) { +// gfshList = StringHelper.stringToList(gfsh); +// pramsMap.put("gfsh", gfshList); +// } else { +// pramsMap.put("gfsh", gfshList); +// } if (!StringHelper.isBlank(invoiceType)) { if (!"99".equals(invoiceType)) { pramsMap.put("invoiceType", invoiceType); @@ -240,7 +241,7 @@ 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("companyCodes",companyCodes); pramsMap.put("companyCode",companyCode); if (!StringHelper.isBlank(rzlx) && !"99".equals(rzlx)) { pramsMap.put("rzlx", rzlx);