优化跟进池

张志伟
1 parent fe1136a4
Showing 3 changed files with 2 additions and 6 deletions
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/follow/FollowDetailVO.java
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/task/FollowRecordTask.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
@@ -41,6 +41,7 @@ public class FollowDetailVO {
      * 是否需要上传录音附件
      */
     private Boolean recordingAttachment;
+    private Long userId;
  
     public long getCountdown() {
         if (Objects.isNull(deadline)) {
@@ -3,7 +3,6 @@ package cn.fw.shirasawa.server.controller.task;
 import cn.fw.shirasawa.common.utils.DateUtil;
 import cn.fw.shirasawa.domain.db.follow.FollowRecord;
 import cn.fw.shirasawa.domain.db.follow.FollowTask;
-import cn.fw.shirasawa.domain.db.pool.CluePool;
 import cn.fw.shirasawa.domain.enums.FollowTypeEnum;
 import cn.fw.shirasawa.domain.enums.TaskStateEnum;
 import cn.fw.shirasawa.rpc.backlog.TodoRpcService;
@@ -138,16 +137,11 @@ public class FollowRecordTask {
         for (FollowRecord record : list) {
             FollowTask task = followTaskService.getById(record.getTaskId());
             if (Objects.nonNull(task) && TaskStateEnum.ONGOING.equals(task.getState())) {
-                CluePool cluePool = cluePoolService.getById(task.getClueId());
                 try {
                     String note = record.getNote();
                     HashMap<String, String> dynamicMap = Optional.ofNullable(JSONObject.<HashMap<String, String>>parseObject(note, HashMap.class)).orElse(new HashMap<>(4));
                     dynamicMap.put("type", record.getType().getValue().toString());
-                    dynamicMap.put("taskId", record.getTaskId().toString());
                     dynamicMap.put("id", record.getId().toString());
-                    dynamicMap.put("state", "1");
-                    dynamicMap.put("customerId", String.valueOf(record.getCustomerId()));
-                    dynamicMap.put("bizType", String.valueOf(cluePool.getBizType().getValue()));
                     BackLogItemDTO dto = new BackLogItemDTO(record.getUserId(), record.getTodoCode(), String.valueOf(record.getId()), DateUtil.localDateTime2Date(record.getPlanTime()), record.getShopId());
                     dto.setExpireTime(DateUtil.localDateTime2Date(record.getDeadline()));
                     dto.setDynamicMap(dynamicMap);
@@ -485,6 +485,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         vo.setBizType(cluePool.getBizType().getValue());
         vo.setTaskId(record.getTaskId());
         vo.setDeadline(record.getDeadline());
+        vo.setUserId(record.getUserId());
         queryTimes(cluePool.getId(), vo);
  
         int count = followRecordLogService.count(Wrappers.<FollowRecordLog>lambdaQuery()