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
e1f45408
Commit
e1f45408
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导入bug
parent
bcaeb8e0
master
…
0727_bugfix
1990_bugfix
2578_bugfix
2580_fix
bugfix_master_1760
master_mv
mobvista_master
month_flow
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+9
-1
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
e1f45408
...
...
@@ -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"
)
+
"行【补充协议签订日期】不能晚于关联合同的结束日期"
);
}
...
...
This diff is collapsed.
Click to expand it.
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