diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowAttachmentDTO.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowAttachmentDTO.java index 71c4727..cf891f2 100644 --- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowAttachmentDTO.java +++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowAttachmentDTO.java @@ -22,6 +22,10 @@ import java.util.Objects; public class FollowAttachmentDTO { private Long id; /** + * 跟进任务id + */ + private Long taskId; + /** * 跟进记录id */ @NotNull(message = "跟进记录id不能为空") diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java index ae37832..ad902ea 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java @@ -587,6 +587,7 @@ public class FollowBizService { for (FollowRecord record : list) { FollowAttachmentDTO dto = new FollowAttachmentDTO(); dto.setAttachments(callId); + dto.setTaskId(record.getTaskId()); dto.setFollowType(followType.getValue()); dto.setRecordId(record.getId()); dto.setFeedbackType(FollowTypeEnum.AC.equals(followType) ? FeedbackTypeEnum.OTHER.getValue() : null); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java index 8906e25..692cb9e 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java @@ -552,6 +552,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { BV.isTrue(Boolean.FALSE.equals(record.getOutTime()), () -> "无法跟进已逾期的待办任务"); FollowRecordLog recordLog = new FollowRecordLog(); recordLog.setId(dto.getId()); + recordLog.setTaskId(record.getTaskId()); recordLog.setAttachments(dto.getAttachments()); recordLog.setFeedbackType(dto.getFeedbackTypeEnum()); recordLog.setAttType(dto.getAttTypeEnum()); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java index 43fb1dc..54d5633 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java @@ -128,6 +128,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy { BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务"); FollowRecordLog recordLog = new FollowRecordLog(); recordLog.setId(dto.getId()); + recordLog.setTaskId(record.getTaskId()); recordLog.setAttachments(dto.getAttachments()); recordLog.setAttType(dto.getAttTypeEnum()); recordLog.setFeedbackType(dto.getFeedbackTypeEnum());