Commit c6b9ce3a9b3c391c8962fc181466d76bbcb575df

Authored by 张志伟
2 parents 39e9ce3d cbc29a25

Merge remote-tracking branch 'origin/dev' into test

fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowAttachmentDTO.java
... ... @@ -22,6 +22,10 @@ import java.util.Objects;
22 22 public class FollowAttachmentDTO {
23 23 private Long id;
24 24 /**
  25 + * 跟进任务id
  26 + */
  27 + private Long taskId;
  28 + /**
25 29 * 跟进记录id
26 30 */
27 31 @NotNull(message = "跟进记录id不能为空")
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java
... ... @@ -587,6 +587,7 @@ public class FollowBizService {
587 587 for (FollowRecord record : list) {
588 588 FollowAttachmentDTO dto = new FollowAttachmentDTO();
589 589 dto.setAttachments(callId);
  590 + dto.setTaskId(record.getTaskId());
590 591 dto.setFollowType(followType.getValue());
591 592 dto.setRecordId(record.getId());
592 593 dto.setFeedbackType(FollowTypeEnum.AC.equals(followType) ? FeedbackTypeEnum.OTHER.getValue() : null);
... ...
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 {
552 552 BV.isTrue(Boolean.FALSE.equals(record.getOutTime()), () -> "无法跟进已逾期的待办任务");
553 553 FollowRecordLog recordLog = new FollowRecordLog();
554 554 recordLog.setId(dto.getId());
  555 + recordLog.setTaskId(record.getTaskId());
555 556 recordLog.setAttachments(dto.getAttachments());
556 557 recordLog.setFeedbackType(dto.getFeedbackTypeEnum());
557 558 recordLog.setAttType(dto.getAttTypeEnum());
... ...
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 {
128 128 BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务");
129 129 FollowRecordLog recordLog = new FollowRecordLog();
130 130 recordLog.setId(dto.getId());
  131 + recordLog.setTaskId(record.getTaskId());
131 132 recordLog.setAttachments(dto.getAttachments());
132 133 recordLog.setAttType(dto.getAttTypeEnum());
133 134 recordLog.setFeedbackType(dto.getFeedbackTypeEnum());
... ...