|
@@ -271,6 +271,8 @@ public class StandardController {
|
|
|
|
|
|
for(int rowIndex=1; rowIndex<=sheet1.getLastRowNum(); rowIndex++){
|
|
|
try {
|
|
|
+ Standard standard = new Standard();
|
|
|
+
|
|
|
String strCompany = poiUtils.getCellValue(0,rowIndex,0).toString();
|
|
|
String strParentDestination = poiUtils.getCellValue(0,rowIndex,1).toString();
|
|
|
String strDestination = poiUtils.getCellValue(0,rowIndex,2).toString();
|
|
@@ -287,12 +289,6 @@ public class StandardController {
|
|
|
String strTaxFee = poiUtils.getCellValue(0,rowIndex,13).toString();
|
|
|
String strReceiptFee = poiUtils.getCellValue(0,rowIndex,14).toString();
|
|
|
|
|
|
- Standard standard = new Standard();
|
|
|
- standard.setId(UUID.randomUUID().toString());
|
|
|
- standard.setDelFlag(false);
|
|
|
- standard.setCreateBy(subject);
|
|
|
- standard.setCreateTime(new Date());
|
|
|
-
|
|
|
if(StringUtils.isNotEmpty(strCompany)){
|
|
|
Company company = companyService.getByName(strCompany);
|
|
|
if(company != null) {
|
|
@@ -507,6 +503,10 @@ public class StandardController {
|
|
|
standard.setReceiptFee(new BigDecimal(0));
|
|
|
}
|
|
|
|
|
|
+ standard.setId(UUID.randomUUID().toString());
|
|
|
+ standard.setDelFlag(false);
|
|
|
+ standard.setCreateBy(subject);
|
|
|
+ standard.setCreateTime(new Date());
|
|
|
standardService.insert(standard);
|
|
|
insertCount++;
|
|
|
}
|