多个建联时间

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/contact/impl/ContactLogServiceImpl.java

@@ -424,17 +424,23 @@ public class ContactLogServiceImpl implements ContactLogService {
         }else {
             ContactBizTypeEnum bizTypeEnum = ContactBizTypeEnum.fromType(bizType);
             Long bizContactTime = bizTypeEnum.getEsClerkContactTime(contactTime);
-            clerkContactTimeList = clerkContactTimeList.stream().map(time -> {
-                        if (String.valueOf(time).length() == 14) {
+            for (ContactBizTypeEnum contactBizTypeEnum : ContactBizTypeEnum.values()) {
+                Long t = clerkContactTimeList.stream().map(time -> {
+                            if (String.valueOf(time).length() == 14) {
+                                return null;
+                            }
+                            if (Objects.equals(contactBizTypeEnum.getCodePre(), bizTypeEnum.getCodePre())) {
+                                return bizContactTime;
+                            }else if (!String.valueOf(time).startsWith(bizTypeEnum.getCodePre())){
+                                return time;
+                            }
                             return null;
-                        }
-                        if (String.valueOf(time).startsWith(bizTypeEnum.getCodePre())) {
-                            return bizContactTime;
-                        } else {
-                            return time;
-                        }
-            }).filter(Objects::nonNull)
-            .collect(Collectors.toList());
+                        }).filter(Objects::nonNull)
+                        .findFirst().orElse(null);
+                if (t != null) {
+                    clerkContactTimeList.add(t);
+                }
+            }
         }
         // 增加原始创建时间用于排序
         if (CollectionUtils.isNotEmpty(clerkContactTimeList)) {