Skip to content

T
traffic-front
Commit 765fc576 authored by gary's avatar gary
Browse files
Options

1、fixbug

parent f438efef
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 765fc576
...@@ -273,9 +273,9 @@ public class DataImportService extends BaseService { ...@@ -273,9 +273,9 @@ public class DataImportService extends BaseService {
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ? taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber(); organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
} }
String periodStr = sheet.getRow(2).getCell(2).getStringCellValue().substring(3); String periodStr = getCellStringValue(sheet.getRow(2).getCell(2)).substring(3);
String companyName = sheet.getRow(4).getCell(1).getStringCellValue(); String companyName = getCellStringValue(sheet.getRow(4).getCell(1));
String fileType = sheet.getRow(0).getCell(2).getStringCellValue(); String fileType = getCellStringValue(sheet.getRow(0).getCell(2));
Integer period = DateUtils.strToPeriod(periodStr); Integer period = DateUtils.strToPeriod(periodStr);
Integer tmsPeriod = DateUtils.strToPeriod(periodDate); Integer tmsPeriod = DateUtils.strToPeriod(periodDate);
...@@ -448,8 +448,8 @@ public class DataImportService extends BaseService { ...@@ -448,8 +448,8 @@ public class DataImportService extends BaseService {
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ? taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber(); organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
} }
String periodStr = sheet.getRow(2).getCell(2).getStringCellValue().substring(3); String periodStr = getCellStringValue(sheet.getRow(2).getCell(2)).substring(3);
String fileType = sheet.getRow(0).getCell(2).getStringCellValue(); String fileType = getCellStringValue(sheet.getRow(0).getCell(2));
Integer period = DateUtils.strToPeriod(periodStr); Integer period = DateUtils.strToPeriod(periodStr);
Integer tmsPeriod = DateUtils.strToPeriod(periodDate); Integer tmsPeriod = DateUtils.strToPeriod(periodDate);
...@@ -595,8 +595,8 @@ public class DataImportService extends BaseService { ...@@ -595,8 +595,8 @@ public class DataImportService extends BaseService {
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ? taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber(); organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
} }
String periodStr = sheet.getRow(4).getCell(8).getStringCellValue(); String periodStr = getCellStringValue(sheet.getRow(4).getCell(8));
String fileType = sheet.getRow(0).getCell(0).getStringCellValue(); String fileType = getCellStringValue(sheet.getRow(0).getCell(0));
Date dataDate = DateUtils.strToDate2(sheet.getRow(4).getCell(10).getStringCellValue()); Date dataDate = DateUtils.strToDate2(sheet.getRow(4).getCell(10).getStringCellValue());
Integer period = DateUtils.strToPeriod(periodStr); 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