刷新建联时间

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

@@ -24,6 +24,7 @@ import com.gic.haoban.app.objectives.api.service.ObjectivesManageApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.constants.Manage3Constants;
 import com.gic.haoban.manage.api.dto.contact.ContactConfigDTO;
+import com.gic.haoban.manage.api.dto.contact.ContactLogDTO;
 import com.gic.haoban.manage.api.enums.contact.ContactAutoTypeEnum;
 import com.gic.haoban.manage.api.enums.contact.ContactBizTypeEnum;
 import com.gic.haoban.manage.api.enums.contact.ContactFollowTypeEnum;
@@ -416,35 +417,10 @@ public class ContactLogServiceImpl implements ContactLogService {
         if (clerkContactTimeList == null) {
             clerkContactTimeList = new ArrayList<>();
         }
-        if (bizType == null) {
-            clerkContactTimeList = Arrays.stream(ContactBizTypeEnum.values())
-                    .map(bizTypeEnum -> bizTypeEnum.getEsClerkContactTime(contactTime))
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
-        }else {
-            ContactBizTypeEnum bizTypeEnum = ContactBizTypeEnum.fromType(bizType);
-            Long bizContactTime = bizTypeEnum.getEsClerkContactTime(contactTime);
-            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;
-                        }).filter(Objects::nonNull)
-                        .findFirst().orElse(null);
-                if (t != null) {
-                    clerkContactTimeList.add(t);
-                }
-            }
-        }
-        // 增加原始创建时间用于排序
-        if (CollectionUtils.isNotEmpty(clerkContactTimeList)) {
-            clerkContactTimeList.add(contactTime);
+        List<TabContactLog> list = getClerkContactTimeList(memberId);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<ContactLogDTO> dtos = EntityUtil.changeEntityListNew(ContactLogDTO.class, list);
+            clerkContactTimeList = ContactBizTypeEnum.getEsClerkContactTimeList(dtos);
         }
 
         logger.info("刷新建联时间:{},memberId:{}", clerkContactTimeList,memberId);