|
@@ -140,13 +140,12 @@ public class AsyncTaskImportService {
|
|
Cell idtypeCell = row.getCell(10);//证件类型
|
|
Cell idtypeCell = row.getCell(10);//证件类型
|
|
Cell idcardnoCell = row.getCell(12);//证件号码
|
|
Cell idcardnoCell = row.getCell(12);//证件号码
|
|
Cell telephoneCell = row.getCell(13);//手机号码
|
|
Cell telephoneCell = row.getCell(13);//手机号码
|
|
- Cell officeNameCell = row.getCell(14);//机构名称
|
|
|
|
- Cell housetypeCell = row.getCell(16);//住房类型
|
|
|
|
- Cell customergroupCell = row.getCell(18);//开户分组
|
|
|
|
- Cell vatnoCell = row.getCell(19);//公司税号
|
|
|
|
- Cell emailCell = row.getCell(20);//电子邮箱
|
|
|
|
- Cell controlCell = row.getCell(21);//阀控规则
|
|
|
|
- Cell c_remark = row.getCell(22);//备注
|
|
|
|
|
|
+ Cell housetypeCell = row.getCell(15);//住房类型
|
|
|
|
+ Cell customergroupCell = row.getCell(16);//开户分组
|
|
|
|
+ Cell vatnoCell = row.getCell(17);//公司税号
|
|
|
|
+ Cell emailCell = row.getCell(18);//电子邮箱
|
|
|
|
+ Cell controlCell = row.getCell(19);//阀控规则
|
|
|
|
+ Cell c_remark = row.getCell(20);//备注
|
|
|
|
|
|
if (accountnumberCell == null || StringUtils.equals("",accountnumberCell.getStringCellValue())) {
|
|
if (accountnumberCell == null || StringUtils.equals("",accountnumberCell.getStringCellValue())) {
|
|
//throw new ServiceException(-900, "客户编码不能为空");
|
|
//throw new ServiceException(-900, "客户编码不能为空");
|
|
@@ -183,7 +182,7 @@ public class AsyncTaskImportService {
|
|
String accountname = accountnameCell.getStringCellValue().trim();
|
|
String accountname = accountnameCell.getStringCellValue().trim();
|
|
String metercode = metercodeCell.getStringCellValue().trim();
|
|
String metercode = metercodeCell.getStringCellValue().trim();
|
|
String calculateway = calculatewayCell.getStringCellValue().trim();
|
|
String calculateway = calculatewayCell.getStringCellValue().trim();
|
|
- String officeName = officeNameCell.getStringCellValue().trim();
|
|
|
|
|
|
+
|
|
String propertyName = propertyNameCell.getStringCellValue().trim();
|
|
String propertyName = propertyNameCell.getStringCellValue().trim();
|
|
String fixedamount = fixedamountCell.getStringCellValue().trim();
|
|
String fixedamount = fixedamountCell.getStringCellValue().trim();
|
|
String idtype = idtypeCell.getStringCellValue().trim();
|
|
String idtype = idtypeCell.getStringCellValue().trim();
|