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
1b317c20
Commit
1b317c20
authored
Jan 20, 2021
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导入时当ip发送日早于合同开始日时以合同开始日为准
parent
9e87e2ac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+3
-0
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
1b317c20
...
...
@@ -2772,6 +2772,9 @@ public class ContractServiceImpl implements ContractService {
if
(!
StringUtils
.
isEmpty
(
validStartDateStr
)){
DateTime
dateTime
=
new
DateTime
(
validStartDateStr
);
DateTime
startDate
=
new
DateTime
(
start_date
);
if
(
dateTime
.
isBefore
(
startDate
)){
dateTime
=
startDate
;
}
DateTime
endDate
=
new
DateTime
(
end_date
);
filter
.
put
(
"valid_start_date"
,
dateTime
.
toString
(
"yyyy-MM-dd"
));
if
(
filter
.
get
(
"one_time"
).
equals
(
"否"
)){
...
...
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