Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
7bf69cf0
Commit
7bf69cf0
authored
May 16, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.11-增减混合同一人,加上requestId区分
parent
3a0d2593
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
TSocialFriendServiceImpl.java
...v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
+9
-6
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendServiceImpl.java
View file @
7bf69cf0
...
@@ -94,11 +94,13 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -94,11 +94,13 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
FriendResult
info
;
FriendResult
info
;
List
<
FriendResult
>
resultList
;
List
<
FriendResult
>
resultList
;
Map
<
String
,
FriendResult
>
resultMap
;
Map
<
String
,
FriendResult
>
resultMap
;
String
key
;
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
if
(
socialList
!=
null
&&
!
socialList
.
isEmpty
())
{
logList
=
new
ArrayList
<>();
logList
=
new
ArrayList
<>();
resultMap
=
new
HashMap
<>();
resultMap
=
new
HashMap
<>();
for
(
TSocialInfo
socialInfo
:
socialList
)
{
for
(
TSocialInfo
socialInfo
:
socialList
)
{
info
=
resultMap
.
get
(
socialInfo
.
getEmpIdcard
());
key
=
socialInfo
.
getEmpIdcard
()+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getYgsRequestId
();
info
=
resultMap
.
get
(
key
);
if
(
info
==
null
)
{
if
(
info
==
null
)
{
backLog
=
new
TSocialFriendBackLog
();
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
socialInfo
.
getEmpIdcard
());
backLog
.
setSocialId
(
socialInfo
.
getEmpIdcard
());
...
@@ -112,9 +114,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -112,9 +114,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
logList
.
add
(
backLog
);
logList
.
add
(
backLog
);
if
(
resultList
!=
null
&&
!
resultList
.
isEmpty
())
{
if
(
resultList
!=
null
&&
!
resultList
.
isEmpty
())
{
for
(
FriendResult
result
:
resultList
)
{
for
(
FriendResult
result
:
resultList
)
{
resultMap
.
put
(
result
.
getIdCard
(),
result
);
resultMap
.
put
(
result
.
getIdCard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getYgsRequestId
()
,
result
);
}
}
info
=
resultMap
.
get
(
socialInfo
.
getEmpIdcard
()
);
info
=
resultMap
.
get
(
key
);
}
}
}
else
{
}
else
{
backLog
.
setSocialId
(
backLog
.
getSocialId
()
+
","
+
socialInfo
.
getEmpIdcard
());
backLog
.
setSocialId
(
backLog
.
getSocialId
()
+
","
+
socialInfo
.
getEmpIdcard
());
...
@@ -135,7 +137,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -135,7 +137,8 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
resultMap
=
new
HashMap
<>();
resultMap
=
new
HashMap
<>();
backLog
=
new
TSocialFriendBackLog
();
backLog
=
new
TSocialFriendBackLog
();
for
(
TSocialInfo
socialInfo
:
socialYsdList
)
{
for
(
TSocialInfo
socialInfo
:
socialYsdList
)
{
info
=
resultMap
.
get
(
socialInfo
.
getEmpIdcard
());
key
=
socialInfo
.
getEmpIdcard
()+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getYsdRequestId
();
info
=
resultMap
.
get
(
key
);
if
(
info
==
null
)
{
if
(
info
==
null
)
{
backLog
=
new
TSocialFriendBackLog
();
backLog
=
new
TSocialFriendBackLog
();
backLog
.
setSocialId
(
socialInfo
.
getEmpIdcard
());
backLog
.
setSocialId
(
socialInfo
.
getEmpIdcard
());
...
@@ -148,9 +151,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
...
@@ -148,9 +151,9 @@ public class TSocialFriendServiceImpl extends ServiceImpl<TSocialFriendMapper, T
,
backLog
,
socialInfo
.
getDispatchType
());
,
backLog
,
socialInfo
.
getDispatchType
());
if
(
resultList
!=
null
&&
!
resultList
.
isEmpty
())
{
if
(
resultList
!=
null
&&
!
resultList
.
isEmpty
())
{
for
(
FriendResult
result
:
resultList
)
{
for
(
FriendResult
result
:
resultList
)
{
resultMap
.
put
(
result
.
getIdCard
(),
result
);
resultMap
.
put
(
result
.
getIdCard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
socialInfo
.
getYsdRequestId
()
,
result
);
}
}
info
=
resultMap
.
get
(
socialInfo
.
getEmpIdcard
()
);
info
=
resultMap
.
get
(
key
);
}
}
logList
.
add
(
backLog
);
logList
.
add
(
backLog
);
}
else
{
}
else
{
...
...
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