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
09a01c1f
Commit
09a01c1f
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
859c7d72
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+5
-5
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
09a01c1f
...
...
@@ -2675,9 +2675,9 @@ public class ContractServiceImpl implements ContractService {
}
else
{
return
ResultModel
.
ERROR
(
"第"
+
line_num
+
"行【行政区域】code错误"
);
}
}
else
if
(
"relation_co
ntract
"
.
equals
(
sheetTitle
)){
}
else
if
(
"relation_co
de
"
.
equals
(
sheetTitle
)){
s_data
[
w
]
=
dataSTR
;
filter
.
put
(
"relation
Contract
"
,
dataSTR
);
filter
.
put
(
"relation
_code
"
,
dataSTR
);
}
else
{
//主账号不为空,按照之前逻辑不变
s_data
[
w
]
=
dataSTR
;
...
...
@@ -2692,11 +2692,11 @@ public class ContractServiceImpl implements ContractService {
}
if
(
platform
.
equals
(
"tkio"
)&&
filter
.
get
(
"contractType"
).
equals
(
"2"
)){
if
(
filter
.
get
(
"relation
Contract
"
)==
null
){
if
(
filter
.
get
(
"relation
_code
"
)==
null
){
return
ResultModel
.
ERROR
(
"第"
+
filter
.
get
(
"rowIndex"
)
+
"行【关联合同编号】为空"
);
}
else
{
String
relation
Contract
=
filter
.
get
(
"relationContract
"
);
Contract
masterContract
=
contractRepository
.
findByCodePlatform
(
relation
Contract
,
"tkio"
);
String
relation
_code
=
filter
.
get
(
"relation_code
"
);
Contract
masterContract
=
contractRepository
.
findByCodePlatform
(
relation
_code
,
"tkio"
);
if
(
masterContract
==
null
){
return
ResultModel
.
ERROR
(
"第"
+
filter
.
get
(
"rowIndex"
)
+
"行【关联合同编号】不存在"
);
}
else
{
...
...
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