Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
relation
Commits
ce67ec2e
Commit
ce67ec2e
authored
Sep 24, 2025
by
zhuxiang
Browse files
Merge remote-tracking branch 'origin/dev' into dev
parents
dd196498
4a5fa740
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/platform/service/impl/CaseServiceImpl.java
View file @
ce67ec2e
...
@@ -52,14 +52,14 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
...
@@ -52,14 +52,14 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
//查看案件所有的excelData
//查看案件所有的excelData
List
<
ExcelDataVO
>
excelDataEntityList
=
excelDataService
.
queryByCaseId
(
caseDTO
);
List
<
ExcelDataVO
>
excelDataEntityList
=
excelDataService
.
queryByCaseId
(
caseDTO
);
//过滤掉payeeName和payUserName一样的数据
//过滤掉payeeName和payUserName一样的数据
List
<
ExcelDataVO
>
excelDataEntityList1
=
Lists
.
newArrayList
();
//
List<ExcelDataVO> excelDataEntityList1 = Lists.newArrayList();
for
(
ExcelDataVO
excelDataVO
:
excelDataEntityList
)
{
//
for (ExcelDataVO excelDataVO : excelDataEntityList) {
if
(
StringUtils
.
isNotEmpty
(
excelDataVO
.
getPayUserName
())
//
if (StringUtils.isNotEmpty(excelDataVO.getPayUserName())
&&
StringUtils
.
isNotEmpty
(
excelDataVO
.
getPayeeName
()))
{
//
&& StringUtils.isNotEmpty(excelDataVO.getPayeeName())) {
excelDataEntityList1
.
add
(
excelDataVO
);
//
excelDataEntityList1.add(excelDataVO);
}
//
}
}
//
}
excelDataEntityList
1
.
forEach
(
excelDataEntity
->
{
excelDataEntityList
.
forEach
(
excelDataEntity
->
{
if
(
StringUtils
.
isNull
(
excelDataEntity
.
getPayUserName
()))
{
if
(
StringUtils
.
isNull
(
excelDataEntity
.
getPayUserName
()))
{
excelDataEntity
.
setPayUserName
(
"无对应人员的数据"
);
excelDataEntity
.
setPayUserName
(
"无对应人员的数据"
);
}
}
...
@@ -68,7 +68,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
...
@@ -68,7 +68,7 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
// 调用分组方法
// 调用分组方法
userList
.
forEach
(
userName
->
groupedMap
.
put
(
userName
,
Lists
.
newArrayList
()));
userList
.
forEach
(
userName
->
groupedMap
.
put
(
userName
,
Lists
.
newArrayList
()));
groupByPayUserName
(
groupedMap
,
excelDataEntityList
1
);
groupByPayUserName
(
groupedMap
,
excelDataEntityList
);
//初始化集合
//初始化集合
List
<
CaseVO
>
caseVOList
=
Lists
.
newArrayList
();
List
<
CaseVO
>
caseVOList
=
Lists
.
newArrayList
();
//遍历groupedMap
//遍历groupedMap
...
@@ -79,11 +79,18 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
...
@@ -79,11 +79,18 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
userFlag
=
excelDataEntityListNew
.
get
(
0
).
getUserFlag
();
userFlag
=
excelDataEntityListNew
.
get
(
0
).
getUserFlag
();
}
}
UserEntity
user
=
userService
.
getByUserName
(
entry
.
getKey
(),
caseDTO
.
getId
());
UserEntity
user
=
userService
.
getByUserName
(
entry
.
getKey
(),
caseDTO
.
getId
());
caseVOList
.
add
(
CaseVO
.
builder
().
excelDataList
(
excelDataEntityListNew
)
if
(!
ObjectUtils
.
isEmpty
(
user
)){
.
payUserName
(
entry
.
getKey
())
caseVOList
.
add
(
CaseVO
.
builder
().
excelDataList
(
excelDataEntityListNew
)
.
userFlag
(
userFlag
)
.
payUserName
(
entry
.
getKey
())
.
idCard
(
user
.
getIdCard
())
.
userFlag
(
userFlag
)
.
build
());
.
idCard
(
user
.
getIdCard
())
.
build
());
}
else
if
(
CollUtil
.
isNotEmpty
(
excelDataEntityListNew
))
{
caseVOList
.
add
(
CaseVO
.
builder
().
excelDataList
(
excelDataEntityListNew
)
.
payUserName
(
entry
.
getKey
())
.
userFlag
(
userFlag
)
.
build
());
}
}
}
return
caseVOList
;
return
caseVOList
;
}
}
...
...
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