valhalla / fw-valhalla

Commit 6ee632676172d7975cfcfaa5cfe59b7757e43b34

Authored by 张志伟
2 parents 4d50293d 2ae387c9

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

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowAttachmentDTO.java
  View file @6ee6326
... ... @@ -20,6 +20,7 @@ import java.util.Objects;
20 20 @Data
21 21 @ToString
22 22 public class FollowAttachmentDTO {
  23 + private Long id;
23 24 /**
24 25 * 跟进记录id
25 26 */
... ... @@ -44,6 +45,7 @@ public class FollowAttachmentDTO {
44 45 * 反馈类型
45 46 */
46 47 @EnumValue(enumClass = FeedbackTypeEnum.class, message = "反馈类型不正确")
  48 + @NotNull(message = "反馈类型不能为空")
47 49 private Integer feedbackType;
48 50 /**
49 51 * 描述
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
  View file @6ee6326
... ... @@ -525,13 +525,14 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
525 525 BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务");
526 526 BV.isTrue(Boolean.FALSE.equals(record.getOutTime()), () -> "无法跟进已逾期的待办任务");
527 527 FollowRecordLog recordLog = new FollowRecordLog();
  528 + recordLog.setId(dto.getId());
528 529 recordLog.setAttachments(dto.getAttachments());
529 530 recordLog.setFeedbackType(dto.getFeedbackTypeEnum());
530 531 recordLog.setAttType(dto.getAttTypeEnum());
531 532 recordLog.setDescribes(dto.getDescribes());
532 533 recordLog.setRecordId(dto.getRecordId());
533 534 recordLog.setUploadTime(new Date());
534   - followRecordLogService.save(recordLog);
  535 + followRecordLogService.saveOrUpdate(recordLog);
535 536 feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum());
536 537 }
537 538  
... ...