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

导出功能修复一个税号多公司报错问题

Browse Source
release
yishiqihuasheng 2 years ago
parent d939457f28
commit 604ff25f86
4 changed files with 134 additions and 102 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. 54
      dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java
  2. 52
      dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java
  3. 54
      dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java
  4. 52
      dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java

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

@ -226,34 +226,42 @@ public class PoolAddTaxThread extends BaseThread {
pramsMap.put("companyCode",companyCode); pramsMap.put("companyCode",companyCode);
// 导出文件名 // 导出文件名
StringBuilder ftpFileName = new StringBuilder(); StringBuilder ftpFileName = new StringBuilder();
ftpFileName.append(userid);
ftpFileName.append(fileSplit);
ftpFileName.append(fileNamePrefix); ftpFileName.append(fileNamePrefix);
ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
if ("99".equals(gfTaxNo)) { ftpFileName.append(DateUtils.getStringDateShort());
if (gfshList.size() > 0) {
if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
} ftpFileName.append((new Date()).getTime());
} ftpFileName.append(fileNameSurfix);
} else { // ftpFileName.append(fileNamePrefix);
if (gfshList.size() > 0) { // ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
// for (String s : gfshList) { // ftpFileName.append(fileSplit);
// if (StringUtils.isNotEmpty(s)){ // if ("99".equals(gfTaxNo)) {
// ftpFileName.append(poolPaperService.getGfName(s)); // if (gfshList.size() > 0) {
// if (StringUtils.isNotEmpty(gfshList.get(0))){
// ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
// ftpFileName.append(fileSplit); // ftpFileName.append(fileSplit);
// } // }
// } // }
if (StringUtils.isNotEmpty(gfshList.get(0))){ // } else {
ftpFileName.append(poolPaperService.getGfName(gfshList.get(0))); // if (gfshList.size() > 0) {
ftpFileName.append(fileSplit); //// for (String s : gfshList) {
} //// if (StringUtils.isNotEmpty(s)){
} //// ftpFileName.append(poolPaperService.getGfName(s));
} //// ftpFileName.append(fileSplit);
//// }
ftpFileName.append(DateUtils.getNowTimeStamp()); //// }
title = ftpFileName.toString(); // if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(fileNameSurfix); // ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
// ftpFileName.append(fileSplit);
// }
// }
// }
//
// ftpFileName.append(DateUtils.getNowTimeStamp());
// title = ftpFileName.toString();
// ftpFileName.append(fileNameSurfix);
// 本地文件存储路径 // 本地文件存储路径
StringBuilder excelFile = new StringBuilder(); StringBuilder excelFile = new StringBuilder();
@ -409,7 +417,7 @@ public class PoolAddTaxThread extends BaseThread {
if (firstPage) { if (firstPage) {
writeSheet = new WriteSheet(); writeSheet = new WriteSheet();
writeSheet.setSheetNo(sheetNo); writeSheet.setSheetNo(sheetNo);
writeSheet.setSheetName(sheetName); writeSheet.setSheetName(title);
writeTable = new WriteTable(); writeTable = new WriteTable();
writeTable.setTableNo(sheetNo); writeTable.setTableNo(sheetNo);
List<List<String>> titles = new ArrayList<>(); List<List<String>> titles = new ArrayList<>();

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

@ -177,34 +177,42 @@ public class PoolOtherThread extends BaseThread {
// 导出文件名 // 导出文件名
StringBuilder ftpFileName = new StringBuilder(); StringBuilder ftpFileName = new StringBuilder();
ftpFileName.append(userid);
ftpFileName.append(fileSplit);
ftpFileName.append(fileNamePrefix); ftpFileName.append(fileNamePrefix);
ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
if ("99".equals(gfTaxNo)) { ftpFileName.append(DateUtils.getStringDateShort());
if (gfshList.size() > 0) {
if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
} ftpFileName.append((new Date()).getTime());
} ftpFileName.append(fileNameSurfix);
} else { // ftpFileName.append(fileNamePrefix);
if (gfshList.size() > 0) { // ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
// for (String s : gfshList) { // ftpFileName.append(fileSplit);
// if (StringUtils.isNotEmpty(s)){ // if ("99".equals(gfTaxNo)) {
// ftpFileName.append(poolPaperService.getGfName(s)); // if (gfshList.size() > 0) {
// if (StringUtils.isNotEmpty(gfshList.get(0))){
// ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
// ftpFileName.append(fileSplit); // ftpFileName.append(fileSplit);
// } // }
// } // }
if (StringUtils.isNotEmpty(gfshList.get(0))){ // } else {
ftpFileName.append(poolPaperService.getGfName(gfshList.get(0))); // if (gfshList.size() > 0) {
ftpFileName.append(fileSplit); //// for (String s : gfshList) {
} //// if (StringUtils.isNotEmpty(s)){
} //// ftpFileName.append(poolPaperService.getGfName(s));
} //// ftpFileName.append(fileSplit);
//// }
ftpFileName.append(DateUtils.getNowTimeStamp()); //// }
title = ftpFileName.toString(); // if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(fileNameSurfix); // ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
// ftpFileName.append(fileSplit);
// }
// }
// }
//
// ftpFileName.append(DateUtils.getNowTimeStamp());
// title = ftpFileName.toString();
// ftpFileName.append(fileNameSurfix);
// 本地文件存储路径 // 本地文件存储路径
StringBuilder excelFile = new StringBuilder(); StringBuilder excelFile = new StringBuilder();

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

@ -225,34 +225,42 @@ public class PoolSaleThread extends BaseThread {
pramsMap.put("invoiceSource",prams.getString("invoiceSource")); pramsMap.put("invoiceSource",prams.getString("invoiceSource"));
// 导出文件名 // 导出文件名
StringBuilder ftpFileName = new StringBuilder(); StringBuilder ftpFileName = new StringBuilder();
ftpFileName.append(userid);
ftpFileName.append(fileSplit);
ftpFileName.append(fileNamePrefix); ftpFileName.append(fileNamePrefix);
ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
if ("99".equals(gfTaxNo)) { ftpFileName.append(DateUtils.getStringDateShort());
if (gfshList.size() > 0) {
if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
} ftpFileName.append((new Date()).getTime());
} ftpFileName.append(fileNameSurfix);
} else { // ftpFileName.append(fileNamePrefix);
if (gfshList.size() > 0) { // ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
// for (String s : gfshList) { // ftpFileName.append(fileSplit);
// if (StringUtils.isNotEmpty(s)){ // if ("99".equals(gfTaxNo)) {
// ftpFileName.append(poolPaperService.getGfName(s)); // if (gfshList.size() > 0) {
// if (StringUtils.isNotEmpty(gfshList.get(0))){
// ftpFileName.append(poolPaperService.getblocName(gfshList.get(0)));
// ftpFileName.append(fileSplit); // ftpFileName.append(fileSplit);
// } // }
// } // }
if (StringUtils.isNotEmpty(gfshList.get(0))){ // } else {
ftpFileName.append(poolPaperService.getGfName(gfshList.get(0))); // if (gfshList.size() > 0) {
ftpFileName.append(fileSplit); //// for (String s : gfshList) {
} //// if (StringUtils.isNotEmpty(s)){
} //// ftpFileName.append(poolPaperService.getGfName(s));
} //// ftpFileName.append(fileSplit);
//// }
ftpFileName.append(DateUtils.getNowTimeStamp()); //// }
title = ftpFileName.toString(); // if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(fileNameSurfix); // ftpFileName.append(poolPaperService.getGfName(gfshList.get(0)));
// ftpFileName.append(fileSplit);
// }
// }
// }
//
// ftpFileName.append(DateUtils.getNowTimeStamp());
// title = ftpFileName.toString();
// ftpFileName.append(fileNameSurfix);
// 本地文件存储路径 // 本地文件存储路径
StringBuilder excelFile = new StringBuilder(); StringBuilder excelFile = new StringBuilder();
@ -407,7 +415,7 @@ public class PoolSaleThread extends BaseThread {
if (firstPage) { if (firstPage) {
writeSheet = new WriteSheet(); writeSheet = new WriteSheet();
writeSheet.setSheetNo(sheetNo); writeSheet.setSheetNo(sheetNo);
writeSheet.setSheetName(sheetName); writeSheet.setSheetName(title);
writeTable = new WriteTable(); writeTable = new WriteTable();
writeTable.setTableNo(sheetNo); writeTable.setTableNo(sheetNo);

52
dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java
Unescape View File

@ -130,34 +130,42 @@ public class QypcsmkpExportThread extends BaseThread {
} }
// 导出文件名 // 导出文件名
StringBuilder ftpFileName = new StringBuilder(); StringBuilder ftpFileName = new StringBuilder();
ftpFileName.append(userid);
ftpFileName.append(fileSplit);
ftpFileName.append(fileNamePrefix); ftpFileName.append(fileNamePrefix);
ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
if ("99".equals(gfTaxNo)) { ftpFileName.append(DateUtils.getStringDateShort());
if (gfshList.size() > 0) {
if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(ticketService.getblocName(gfshList.get(0)));
ftpFileName.append(fileSplit); ftpFileName.append(fileSplit);
} ftpFileName.append((new Date()).getTime());
} ftpFileName.append(fileNameSurfix);
} else { // ftpFileName.append(fileNamePrefix);
if (gfshList.size() > 0) { // ftpFileName.append(DateUtils.dateToMonthStr(new Date()));
// for (String s : gfshList) { // ftpFileName.append(fileSplit);
// if (StringUtils.isNotEmpty(s)){ // if ("99".equals(gfTaxNo)) {
// ftpFileName.append(ticketService.getGfName(s)); // if (gfshList.size() > 0) {
// if (StringUtils.isNotEmpty(gfshList.get(0))){
// ftpFileName.append(ticketService.getblocName(gfshList.get(0)));
// ftpFileName.append(fileSplit); // ftpFileName.append(fileSplit);
// } // }
// } // }
if (StringUtils.isNotEmpty(gfshList.get(0))){ // } else {
ftpFileName.append(ticketService.getGfName(gfshList.get(0))); // if (gfshList.size() > 0) {
ftpFileName.append(fileSplit); //// for (String s : gfshList) {
} //// if (StringUtils.isNotEmpty(s)){
} //// ftpFileName.append(ticketService.getGfName(s));
} //// ftpFileName.append(fileSplit);
//// }
ftpFileName.append(DateUtils.getNowTimeStamp()); //// }
// title = ftpFileName.toString(); // if (StringUtils.isNotEmpty(gfshList.get(0))){
ftpFileName.append(fileNameSurfix); // ftpFileName.append(ticketService.getGfName(gfshList.get(0)));
// ftpFileName.append(fileSplit);
// }
// }
// }
//
// ftpFileName.append(DateUtils.getNowTimeStamp());
//// title = ftpFileName.toString();
// ftpFileName.append(fileNameSurfix);
// 本地文件存储路径 // 本地文件存储路径
StringBuilder excelFile = new StringBuilder(); StringBuilder excelFile = new StringBuilder();

Write Preview
Loading…
Cancel
Save