Commit 3fcab69d by lzxry

CAS批量导入合同

parent c64a51d9
...@@ -2704,10 +2704,10 @@ public class ContractServiceImpl implements ContractService { ...@@ -2704,10 +2704,10 @@ public class ContractServiceImpl implements ContractService {
}else if("one_time".equals(sheetTitle)){ }else if("one_time".equals(sheetTitle)){
if(dataSTR.equals("否")){ if(dataSTR.equals("否")){
s_data[w] = false; s_data[w] = false;
filter.put("validStartDate",formatter.formatCellValue(row_data.getCell(14)).trim());
}else{ }else{
s_data[w] = true; s_data[w] = true;
} }
filter.put("validStartDate",formatter.formatCellValue(row_data.getCell(14)).trim());
filter.put("one_time",dataSTR); filter.put("one_time",dataSTR);
}else { }else {
//主账号不为空,按照之前逻辑不变 //主账号不为空,按照之前逻辑不变
...@@ -2766,7 +2766,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -2766,7 +2766,7 @@ public class ContractServiceImpl implements ContractService {
String start_date = filter.get("start_date"); String start_date = filter.get("start_date");
String end_date = filter.get("end_date"); String end_date = filter.get("end_date");
String rowIndex = filter.get("rowIndex"); String rowIndex = filter.get("rowIndex");
if(filter.get("one_time").equals("否")){ //if(filter.get("one_time").equals("否")){
String validStartDateStr = filter.get("validStartDate"); String validStartDateStr = filter.get("validStartDate");
if(!StringUtils.isEmpty(validStartDateStr)){ if(!StringUtils.isEmpty(validStartDateStr)){
DateTime dateTime = new DateTime(validStartDateStr); DateTime dateTime = new DateTime(validStartDateStr);
...@@ -2778,7 +2778,8 @@ public class ContractServiceImpl implements ContractService { ...@@ -2778,7 +2778,8 @@ public class ContractServiceImpl implements ContractService {
}else{ }else{
return ResultModel.ERROR("第" + rowIndex + "行主账号【" + email + "】未填写IP发送"); return ResultModel.ERROR("第" + rowIndex + "行主账号【" + email + "】未填写IP发送");
} }
}else{ // }
/*else{
Map<String, Object> adiAccount = checkAccount( email,platform); Map<String, Object> adiAccount = checkAccount( email,platform);
if(adiAccount!=null){ if(adiAccount!=null){
Object result = adiAccount.get("result"); Object result = adiAccount.get("result");
...@@ -2801,7 +2802,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -2801,7 +2802,7 @@ public class ContractServiceImpl implements ContractService {
}else{ }else{
return ResultModel.ERROR("第" + rowIndex + "行ADI主账号校验URL失效"); return ResultModel.ERROR("第" + rowIndex + "行ADI主账号校验URL失效");
} }
} }*/
} }
......
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