Skip to content

M
manager
Commit e0ac8d7b by kangxiaoshan
Options

1

parent 780ab68d
Showing with 1 addition and 1 deletion
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -2427,7 +2427,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -2427,7 +2427,7 @@ public class ContractServiceImpl implements ContractService {
DateTime contractStart = new DateTime(v.getStartDate()); DateTime contractStart = new DateTime(v.getStartDate());
DateTime contractEnd = new DateTime(v.getEndDate()); DateTime contractEnd = new DateTime(v.getEndDate());
// 时间范围是否包含合同结束日期 // 时间范围是否包含合同结束日期
boolean containEnd = formEnd.compareTo(contractEnd) > 0; boolean containEnd = formEnd.compareTo(contractEnd) >= 0;
// 时间范围是否包含合同结束开始日期 // 时间范围是否包含合同结束开始日期
boolean containStart = formStart.compareTo(contractStart) <= 0; boolean containStart = formStart.compareTo(contractStart) <= 0;
//所选结束时间包含合同结束时间 取合同结束时间 反之 取所选结束时间 //所选结束时间包含合同结束时间 取合同结束时间 反之 取所选结束时间
......
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