Commit edeb7b2f by lzxry

cas导入校验ip发送日

parent 3285625c
...@@ -98,8 +98,6 @@ public class ContractServiceImpl implements ContractService { ...@@ -98,8 +98,6 @@ public class ContractServiceImpl implements ContractService {
put("签约销售", "sale"); put("签约销售", "sale");
put("关联合同编号", "relation_code"); put("关联合同编号", "relation_code");
put("补充协议签订日期", "signed_date"); put("补充协议签订日期", "signed_date");
put("有效开始日", "valid_start_date");
put("有效结束日", "valid_end_date");
put("是否计算一次性收入", "one_time"); put("是否计算一次性收入", "one_time");
}}; }};
...@@ -122,8 +120,6 @@ public class ContractServiceImpl implements ContractService { ...@@ -122,8 +120,6 @@ public class ContractServiceImpl implements ContractService {
put("sale", "签约销售"); put("sale", "签约销售");
put("relation_code", "关联合同编号"); put("relation_code", "关联合同编号");
put("signed_date", "补充协议签订日期"); put("signed_date", "补充协议签订日期");
put("valid_start_date", "有效开始日");
put("valid_end_date", "有效结束日");
put("one_time", "是否计算一次性收入"); put("one_time", "是否计算一次性收入");
}}; }};
...@@ -2443,7 +2439,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -2443,7 +2439,7 @@ public class ContractServiceImpl implements ContractService {
if (platform.equals("tkio")) { if (platform.equals("tkio")) {
row_length = 17; row_length = 17;
}if (platform.equals("cas")) { }if (platform.equals("cas")) {
row_length = 16; row_length = 14;
} else { } else {
row_length = 13; row_length = 13;
} }
...@@ -2542,7 +2538,10 @@ public class ContractServiceImpl implements ContractService { ...@@ -2542,7 +2538,10 @@ public class ContractServiceImpl implements ContractService {
if ("tkio".equals(platform)) { if ("tkio".equals(platform)) {
extend_row_sql = "platform,product,my_body_code,create_time,code_num,type,status,back_status,ds," + extend_row_sql = "platform,product,my_body_code,create_time,code_num,type,status,back_status,ds," +
"create_account,create_name,relation_contract,invoice_money,first_back_id"; "create_account,create_name,relation_contract,invoice_money,first_back_id";
} else { }else if("cas".equals(platform)){
extend_row_sql = "platform,product,my_body_code,create_time,code_num,type,status,back_status,ds," +
"create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id,valid_start_date,valid_end_date";
} else{
extend_row_sql = "platform,product,my_body_code,create_time,code_num,type,status,back_status,ds," + extend_row_sql = "platform,product,my_body_code,create_time,code_num,type,status,back_status,ds," +
"create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id"; "create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id";
} }
...@@ -2666,6 +2665,10 @@ public class ContractServiceImpl implements ContractService { ...@@ -2666,6 +2665,10 @@ public class ContractServiceImpl implements ContractService {
if ("start_date".equals(sheetTitle)) { if ("start_date".equals(sheetTitle)) {
filter.put("w",String.valueOf(w)); filter.put("w",String.valueOf(w));
} }
}else if("cas".equals(platform)){
if ("start_date".equals(sheetTitle) || "end_date".equals(sheetTitle) ) {
filter.put(sheetTitle,String.valueOf(s_data[w]));
}
}else{ }else{
if ("start_date".equals(sheetTitle)) { if ("start_date".equals(sheetTitle)) {
createTime = d; createTime = d;
...@@ -2712,6 +2715,8 @@ public class ContractServiceImpl implements ContractService { ...@@ -2712,6 +2715,8 @@ public class ContractServiceImpl implements ContractService {
moreEmail.add(dataSTR.trim()); moreEmail.add(dataSTR.trim());
} }
accountsEmail.add(dataSTR.trim()); accountsEmail.add(dataSTR.trim());
}else if("email".equals(sheetTitle)&&"cas".equals(platform)){
filter.put(sheetTitle,dataSTR.trim());
} }
} }
} }
...@@ -2754,6 +2759,35 @@ public class ContractServiceImpl implements ContractService { ...@@ -2754,6 +2759,35 @@ public class ContractServiceImpl implements ContractService {
} }
} }
} }
}else if("cas".equals(platform)){
String email = filter.get("email");
String start_date = filter.get("start_date");
String end_date = filter.get("end_date");
String rowIndex = filter.get("rowIndex");
Map<String, Object> adiAccount = checkAccount( email,platform);
if(adiAccount!=null){
Object result = adiAccount.get("result");
if(result.equals(1)){
Object validStartDate = adiAccount.get("validStartDate");
if(validStartDate==null||StringUtils.isEmpty(validStartDate)){
return ResultModel.ERROR("第" + rowIndex + "行主账号【" + email + "】未进行IP发送");
}else{
String validStartDateStr = validStartDate.toString().split(" ")[0];
DateTime dateTime = new DateTime(validStartDateStr);
DateTime startDate = new DateTime(start_date);
DateTime endDate = new DateTime(end_date);
int contractAllDay = Days.daysBetween(startDate, endDate).getDays();//合同总天数
filter.put("valid_start_date",dateTime.toString("yyyy-MM-dd"));
filter.put("valid_end_date",dateTime.plusDays(contractAllDay).toString("yyyy-MM-dd"));
}
}else{
return ResultModel.ERROR("第" + rowIndex + "行主账号【" + email + "】不存在");
}
}else{
return ResultModel.ERROR("第" + rowIndex + "行ADI主账号校验URL失效");
}
} }
if (!accountsEmail.isEmpty()) { if (!accountsEmail.isEmpty()) {
...@@ -2811,6 +2845,10 @@ public class ContractServiceImpl implements ContractService { ...@@ -2811,6 +2845,10 @@ public class ContractServiceImpl implements ContractService {
s_data[row_already + 12] = -1; s_data[row_already + 12] = -1;
s_data[row_already + 13] = 0; s_data[row_already + 13] = 0;
s_data[row_already + 14] = 0; s_data[row_already + 14] = 0;
if("cas".equals(platform)){
s_data[row_already + 15] = filter.get("valid_start_date");
s_data[row_already + 16] = filter.get("valid_end_date");
}
} }
//批量添加数据 //批量添加数据
......
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