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
3fcab69d
Commit
3fcab69d
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CAS批量导入合同
parent
c64a51d9
master
…
0727_bugfix
1990_bugfix
2578_bugfix
2580_fix
master_mv
mobvista_master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+5
-4
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
3fcab69d
...
...
@@ -2704,10 +2704,10 @@ public class ContractServiceImpl implements ContractService {
}
else
if
(
"one_time"
.
equals
(
sheetTitle
)){
if
(
dataSTR
.
equals
(
"否"
)){
s_data
[
w
]
=
false
;
filter
.
put
(
"validStartDate"
,
formatter
.
formatCellValue
(
row_data
.
getCell
(
14
)).
trim
());
}
else
{
s_data
[
w
]
=
true
;
}
filter
.
put
(
"validStartDate"
,
formatter
.
formatCellValue
(
row_data
.
getCell
(
14
)).
trim
());
filter
.
put
(
"one_time"
,
dataSTR
);
}
else
{
//主账号不为空,按照之前逻辑不变
...
...
@@ -2766,7 +2766,7 @@ public class ContractServiceImpl implements ContractService {
String
start_date
=
filter
.
get
(
"start_date"
);
String
end_date
=
filter
.
get
(
"end_date"
);
String
rowIndex
=
filter
.
get
(
"rowIndex"
);
if
(
filter
.
get
(
"one_time"
).
equals
(
"否"
)){
//
if(filter.get("one_time").equals("否")){
String
validStartDateStr
=
filter
.
get
(
"validStartDate"
);
if
(!
StringUtils
.
isEmpty
(
validStartDateStr
)){
DateTime
dateTime
=
new
DateTime
(
validStartDateStr
);
...
...
@@ -2778,7 +2778,8 @@ public class ContractServiceImpl implements ContractService {
}
else
{
return
ResultModel
.
ERROR
(
"第"
+
rowIndex
+
"行主账号【"
+
email
+
"】未填写IP发送"
);
}
}
else
{
// }
/*else{
Map<String, Object> adiAccount = checkAccount( email,platform);
if(adiAccount!=null){
Object result = adiAccount.get("result");
...
...
@@ -2801,7 +2802,7 @@ public class ContractServiceImpl implements ContractService {
}else{
return ResultModel.ERROR("第" + rowIndex + "行ADI主账号校验URL失效");
}
}
}
*/
}
...
...
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