Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
manager
Commits
e0ac8d7b
Commit
e0ac8d7b
authored
Jun 02, 2020
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
780ab68d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+1
-1
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
e0ac8d7b
...
...
@@ -2427,7 +2427,7 @@ public class ContractServiceImpl implements ContractService {
DateTime
contractStart
=
new
DateTime
(
v
.
getStartDate
());
DateTime
contractEnd
=
new
DateTime
(
v
.
getEndDate
());
// 时间范围是否包含合同结束日期
boolean
containEnd
=
formEnd
.
compareTo
(
contractEnd
)
>
0
;
boolean
containEnd
=
formEnd
.
compareTo
(
contractEnd
)
>
=
0
;
// 时间范围是否包含合同结束开始日期
boolean
containStart
=
formStart
.
compareTo
(
contractStart
)
<=
0
;
//所选结束时间包含合同结束时间 取合同结束时间 反之 取所选结束时间
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment