Commit 7bf69cf0 authored by hongguangwu's avatar hongguangwu

MVP1.7.11-增减混合同一人,加上requestId区分

parent 3a0d2593
...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment