Commit e1f45408 by lzxry

导入bug

parent bcaeb8e0
......@@ -2638,12 +2638,19 @@ public class ContractServiceImpl implements ContractService {
Date d = cell.getDateCellValue();
DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
s_data[w] = formater.format(d);
if("tkio".equals(platform)){
if("signed_date".equals(sheetTitle)){
createTime = d;
filter.put("signedDate",formater.format(d));
}else if ("start_date".equals(sheetTitle)) {
}
if ("start_date".equals(sheetTitle)) {
filter.put("w",String.valueOf(w));
}
}else{
if ("start_date".equals(sheetTitle)) {
createTime = d;
}
}
} else {
s_data[w] = cell.toString();
......@@ -2698,6 +2705,7 @@ public class ContractServiceImpl implements ContractService {
if(signedDate==null){
return ResultModel.ERROR("第" + filter.get("rowIndex") + "行【补充协议签订日期】为空");
}else{
s_data[Integer.valueOf(filter.get("w"))] = masterContract.getStartDate();
if(endDate.compareTo(signedDate)<0){
return ResultModel.ERROR("第" + filter.get("rowIndex") + "行【补充协议签订日期】不能晚于关联合同的结束日期");
}
......
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