Commit 765fc576 authored by gary's avatar gary

1、fixbug

parent f438efef
......@@ -273,9 +273,9 @@ public class DataImportService extends BaseService {
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
}
String periodStr = sheet.getRow(2).getCell(2).getStringCellValue().substring(3);
String companyName = sheet.getRow(4).getCell(1).getStringCellValue();
String fileType = sheet.getRow(0).getCell(2).getStringCellValue();
String periodStr = getCellStringValue(sheet.getRow(2).getCell(2)).substring(3);
String companyName = getCellStringValue(sheet.getRow(4).getCell(1));
String fileType = getCellStringValue(sheet.getRow(0).getCell(2));
Integer period = DateUtils.strToPeriod(periodStr);
Integer tmsPeriod = DateUtils.strToPeriod(periodDate);
......@@ -448,8 +448,8 @@ public class DataImportService extends BaseService {
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
}
String periodStr = sheet.getRow(2).getCell(2).getStringCellValue().substring(3);
String fileType = sheet.getRow(0).getCell(2).getStringCellValue();
String periodStr = getCellStringValue(sheet.getRow(2).getCell(2)).substring(3);
String fileType = getCellStringValue(sheet.getRow(0).getCell(2));
Integer period = DateUtils.strToPeriod(periodStr);
Integer tmsPeriod = DateUtils.strToPeriod(periodDate);
......@@ -595,8 +595,8 @@ public class DataImportService extends BaseService {
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
}
String periodStr = sheet.getRow(4).getCell(8).getStringCellValue();
String fileType = sheet.getRow(0).getCell(0).getStringCellValue();
String periodStr = getCellStringValue(sheet.getRow(4).getCell(8));
String fileType = getCellStringValue(sheet.getRow(0).getCell(0));
Date dataDate = DateUtils.strToDate2(sheet.getRow(4).getCell(10).getStringCellValue());
Integer period = DateUtils.strToPeriod(periodStr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment