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
c3a87d12
Commit
c3a87d12
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tkio-导出数据bugfix
parent
1395b186
master
…
0727_bugfix
2580_fix
master_mv
mobvista_master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+6
-4
No files found.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
c3a87d12
...
@@ -528,15 +528,17 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
...
@@ -528,15 +528,17 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
}
}
for
(
Contract
groupContract
:
groupContracts
)
{
for
(
Contract
groupContract
:
groupContracts
)
{
if
(
"2"
.
equals
(
groupContract
.
getContractType
()))
{
if
(
"2"
.
equals
(
groupContract
.
getContractType
()))
{
Contract
contract
=
map
.
get
(
groupContract
.
getRelationCode
());
//补充协议查找map内是否有他的主合同(首次/续约)
//2021年7月19日21:01:20 补充:可能会出现补充协议套娃(B1,B2两个补充协议,但是其中B1补充协议因为主体权限原因没有查出来,B2要依赖B1计算单价,这时候要查出B1),所以需要重新查询一遍
if
(
contract
==
null
)
{
//不管主账号在不在,按照现有条件无法判断该补充协议是否被其他合同关联
//查出该补充协议之前签订的所有关联的合同(首次/续约-补充协议)
//只判断补充协议是因为,如果只有首签/续签的权限合同,对于后面的补充协议是不影响的
//Contract contract = map.get(groupContract.getRelationCode());//补充协议查找map内是否有他的主合同(首次/续约)
//if(contract==null){
List
<
Contract
>
contractList
=
contractRepository
.
findByCreateTimeAndCodeNotOwn
(
groupContract
.
getRelationCode
(),
DateUtil
.
format
(
groupContract
.
getCreateTime
(),
DateUtil
.
C_TIME_PATTON_DEFAULT
),
groupContract
.
getId
());
List
<
Contract
>
contractList
=
contractRepository
.
findByCreateTimeAndCodeNotOwn
(
groupContract
.
getRelationCode
(),
DateUtil
.
format
(
groupContract
.
getCreateTime
(),
DateUtil
.
C_TIME_PATTON_DEFAULT
),
groupContract
.
getId
());
for
(
Contract
contract1
:
contractList
)
{
for
(
Contract
contract1
:
contractList
)
{
map
.
put
(
contract1
.
getContractCode
(),
contract1
);
map
.
put
(
contract1
.
getContractCode
(),
contract1
);
}
}
groupContracts
=
map
.
values
();
//只要不加入传进来的那个list里面就不会影响查询的列表
groupContracts
=
map
.
values
();
//只要不加入传进来的那个list里面就不会影响查询的列表
}
break
;
}
}
}
}
...
...
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