Commit 1b317c20 by lzxry

导入时当ip发送日早于合同开始日时以合同开始日为准

parent 9e87e2ac
...@@ -2772,6 +2772,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -2772,6 +2772,9 @@ public class ContractServiceImpl implements ContractService {
if(!StringUtils.isEmpty(validStartDateStr)){ if(!StringUtils.isEmpty(validStartDateStr)){
DateTime dateTime = new DateTime(validStartDateStr); DateTime dateTime = new DateTime(validStartDateStr);
DateTime startDate = new DateTime(start_date); DateTime startDate = new DateTime(start_date);
if(dateTime.isBefore(startDate)){
dateTime = startDate;
}
DateTime endDate = new DateTime(end_date); DateTime endDate = new DateTime(end_date);
filter.put("valid_start_date",dateTime.toString("yyyy-MM-dd")); filter.put("valid_start_date",dateTime.toString("yyyy-MM-dd"));
if(filter.get("one_time").equals("否")){ if(filter.get("one_time").equals("否")){
......
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