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
7613b4ac
Commit
7613b4ac
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
5e49f1ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+4
-2
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
7613b4ac
...
@@ -2534,6 +2534,7 @@ public class ContractServiceImpl implements ContractService {
...
@@ -2534,6 +2534,7 @@ public class ContractServiceImpl implements ContractService {
DataFormatter
formatter
=
new
DataFormatter
();
DataFormatter
formatter
=
new
DataFormatter
();
int
rowNumber
=
sheet
.
getLastRowNum
();
int
rowNumber
=
sheet
.
getLastRowNum
();
List
<
Object
[]>
args_data
=
new
ArrayList
<>();
List
<
Object
[]>
args_data
=
new
ArrayList
<>();
List
<
Contract
>
masterContracts
=
new
ArrayList
<>();
Map
<
String
,
String
>
codeUniqueDic
=
new
HashMap
<>();
Map
<
String
,
String
>
codeUniqueDic
=
new
HashMap
<>();
List
<
String
>
accountsEmail
=
new
ArrayList
<>();
List
<
String
>
accountsEmail
=
new
ArrayList
<>();
...
@@ -2691,7 +2692,7 @@ public class ContractServiceImpl implements ContractService {
...
@@ -2691,7 +2692,7 @@ public class ContractServiceImpl implements ContractService {
}
}
}
}
}
}
List
<
Contract
>
masterContracts
=
new
ArrayList
<>();
if
(
"tkio"
.
equals
(
platform
)&&
"2"
.
equals
(
filter
.
get
(
"contractType"
))){
if
(
"tkio"
.
equals
(
platform
)&&
"2"
.
equals
(
filter
.
get
(
"contractType"
))){
if
(
filter
.
get
(
"relation_code"
)==
null
){
if
(
filter
.
get
(
"relation_code"
)==
null
){
...
@@ -2719,7 +2720,7 @@ public class ContractServiceImpl implements ContractService {
...
@@ -2719,7 +2720,7 @@ public class ContractServiceImpl implements ContractService {
if
(
StringUtils
.
isEmpty
(
contract
.
getNextSignedDate
())){
if
(
StringUtils
.
isEmpty
(
contract
.
getNextSignedDate
())){
contract
.
setNextSignedDate
(
dateTime
.
plusDays
(-
1
).
toString
(
"yyyy-MM-dd"
));
//签订日的前一天
contract
.
setNextSignedDate
(
dateTime
.
plusDays
(-
1
).
toString
(
"yyyy-MM-dd"
));
//签订日的前一天
contract
.
setNextSignedContractCode
(
filter
.
get
(
"contractCode"
));
contract
.
setNextSignedContractCode
(
filter
.
get
(
"contractCode"
));
contractRepository
.
save
(
contract
);
masterContracts
.
add
(
contract
);
break
;
break
;
}
else
{
}
else
{
relationCode
=
contract
.
getNextSignedContractCode
();
relationCode
=
contract
.
getNextSignedContractCode
();
...
@@ -2811,6 +2812,7 @@ public class ContractServiceImpl implements ContractService {
...
@@ -2811,6 +2812,7 @@ public class ContractServiceImpl implements ContractService {
// TransactionStatus transactionStatus = transactionUtils.begin();
// TransactionStatus transactionStatus = transactionUtils.begin();
jdbcTemplate
.
batchUpdate
(
sql
.
toString
(),
args_data
);
jdbcTemplate
.
batchUpdate
(
sql
.
toString
(),
args_data
);
contractRepository
.
save
(
masterContracts
);
// transactionUtils.commit(transactionStatus);
// transactionUtils.commit(transactionStatus);
if
(
"tkio"
.
equals
(
platform
))
{
if
(
"tkio"
.
equals
(
platform
))
{
for
(
String
email
:
moreEmail
)
{
for
(
String
email
:
moreEmail
)
{
...
...
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