Commit 09a01c1f by lzxry

bugfix

parent 859c7d72
...@@ -2675,9 +2675,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -2675,9 +2675,9 @@ public class ContractServiceImpl implements ContractService {
} else { } else {
return ResultModel.ERROR("第" + line_num + "行【行政区域】code错误"); return ResultModel.ERROR("第" + line_num + "行【行政区域】code错误");
} }
}else if("relation_contract".equals(sheetTitle)){ }else if("relation_code".equals(sheetTitle)){
s_data[w] = dataSTR; s_data[w] = dataSTR;
filter.put("relationContract",dataSTR); filter.put("relation_code",dataSTR);
}else { }else {
//主账号不为空,按照之前逻辑不变 //主账号不为空,按照之前逻辑不变
s_data[w] = dataSTR; s_data[w] = dataSTR;
...@@ -2692,11 +2692,11 @@ public class ContractServiceImpl implements ContractService { ...@@ -2692,11 +2692,11 @@ public class ContractServiceImpl implements ContractService {
} }
if(platform.equals("tkio")&&filter.get("contractType").equals("2")){ if(platform.equals("tkio")&&filter.get("contractType").equals("2")){
if(filter.get("relationContract")==null){ if(filter.get("relation_code")==null){
return ResultModel.ERROR("第" + filter.get("rowIndex") + "行【关联合同编号】为空"); return ResultModel.ERROR("第" + filter.get("rowIndex") + "行【关联合同编号】为空");
}else{ }else{
String relationContract = filter.get("relationContract"); String relation_code = filter.get("relation_code");
Contract masterContract = contractRepository.findByCodePlatform(relationContract, "tkio"); Contract masterContract = contractRepository.findByCodePlatform(relation_code, "tkio");
if(masterContract==null){ if(masterContract==null){
return ResultModel.ERROR("第" + filter.get("rowIndex") + "行【关联合同编号】不存在"); return ResultModel.ERROR("第" + filter.get("rowIndex") + "行【关联合同编号】不存在");
}else{ }else{
......
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