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

张志伟
2 parents 4d50293d 2ae387c9
Showing 2 changed files with 4 additions and 1 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowAttachmentDTO.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
@@ -20,6 +20,7 @@ import java.util.Objects;
 @Data
 @ToString
 public class FollowAttachmentDTO {
+    private Long id;
     /**
      * 跟进记录id
      */
@@ -44,6 +45,7 @@ public class FollowAttachmentDTO {
      * 反馈类型
      */
     @EnumValue(enumClass = FeedbackTypeEnum.class, message = "反馈类型不正确")
+    @NotNull(message = "反馈类型不能为空")
     private Integer feedbackType;
     /**
      * 描述
@@ -525,13 +525,14 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务");
         BV.isTrue(Boolean.FALSE.equals(record.getOutTime()), () -> "无法跟进已逾期的待办任务");
         FollowRecordLog recordLog = new FollowRecordLog();
+        recordLog.setId(dto.getId());
         recordLog.setAttachments(dto.getAttachments());
         recordLog.setFeedbackType(dto.getFeedbackTypeEnum());
         recordLog.setAttType(dto.getAttTypeEnum());
         recordLog.setDescribes(dto.getDescribes());
         recordLog.setRecordId(dto.getRecordId());
         recordLog.setUploadTime(new Date());
-        followRecordLogService.save(recordLog);
+        followRecordLogService.saveOrUpdate(recordLog);
         feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum());
     }