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

张志伟
2 parents 0b508067 bcf65897
Showing 10 changed files with 42 additions and 4 deletions
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/follow/FollowDetailVO.java
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/api/FollowApiService.java
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/api/FollowApiServiceImpl.java
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/app/FollowController.java
fw-shirasawa-server/src/main/resources/application-test.yml
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/FollowBizService.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/impl/AFFollowStrategy.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/impl/CFFollowStrategy.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/impl/PFFollowStrategy.java
@@ -34,6 +34,10 @@ public class FollowDetailVO {
      */
     private LocalDateTime deadline;
     /**
+     * 任务截止日期
+     */
+    private LocalDateTime taskDeadline;
+    /**
      * 是否已经打过电话
      */
     private Boolean hadCall;
@@ -42,6 +46,7 @@ public class FollowDetailVO {
      */
     private Boolean recordingAttachment;
     private Long userId;
+    private String reason;
  
     public long getCountdown() {
         if (Objects.isNull(deadline)) {
@@ -55,7 +55,7 @@ public interface FollowApiService {
      * @return
      */
     @PostMapping("/create/record")
-    Message<Void> createNextRecord(@RequestBody NewRecordDTO newRecordDTO);
+    Message<Void> createNextRecord(@Valid @RequestBody NewRecordDTO newRecordDTO);
  
     /**
      * 完成跟进任务
@@ -90,7 +90,7 @@ public class FollowApiServiceImpl implements FollowApiService {
     @Override
     @PostMapping("/create/record")
     @ControllerMethod("完成并生成下一次待办")
-    public Message<Void> createNextRecord(@RequestBody NewRecordDTO newRecordDTO) {
+    public Message<Void> createNextRecord(@Valid @RequestBody NewRecordDTO newRecordDTO) {
         followBizService.createNewRecord(newRecordDTO);
         return success();
     }
@@ -52,7 +52,7 @@ public class FollowController {
     @IgnoreAuth
     @ControllerMethod("查询跟进战败审批详情")
     public Message<FollowDetailVO> approveDetail(@NotNull(message = "跟进记录id不能为空") final Long recordId) {
-        FollowDetailVO detailVO = followBizService.queryFollowDetail(recordId);
+        FollowDetailVO detailVO = followBizService.queryApplyFollowDetail(recordId);
         return success(detailVO);
     }
  
@@ -47,7 +47,7 @@ task:
   switch: 'on'
  
 follow:
-  flowNo: 'J4S66UX7U4'
+  flowNo: 'BRB72153X6'
   todo:
     FMCode: '50rmamxGp7'
     RMCode: 'Zb33mjtjVy'
@@ -323,6 +323,26 @@ public class FollowBizService {
     }
  
     /**
+     * 查询跟进详情(审批用)
+     *
+     * @param recordId 跟进待办id
+     * @return 跟进详情
+     */
+    public FollowDetailVO queryApplyFollowDetail(Long recordId) {
+        FollowDetailVO vo = queryFollowDetail(recordId);
+        ApproveRecord approveRecord = approveRecordService.getOne(Wrappers.<ApproveRecord>lambdaQuery()
+                .eq(ApproveRecord::getDataId, vo.getTaskId())
+                .eq(ApproveRecord::getUserId, vo.getUserId())
+                .eq(ApproveRecord::getType, ApproveTypeEnum.FOLLOW_DEFEAT)
+                .last(" limit 1")
+        );
+        if (Objects.nonNull(approveRecord)) {
+            vo.setReason(approveRecord.getReason());
+        }
+        return vo;
+    }
+
+    /**
      * 查询跟进详情
      *
      * @param recordId 跟进待办id
@@ -221,6 +221,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         FollowDetailVO vo = new FollowDetailVO();
         vo.setId(record.getId());
         assembleRecordDetail(vo, record, cluePool);
+        vo.setTaskDeadline(followTask.getDeadline());
         return vo;
     }
  
@@ -20,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
  
 import static cn.fw.common.businessvalidator.Validator.BV;
@@ -97,6 +98,9 @@ public class AFFollowStrategy extends AbstractFollowStrategy {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createNewRecord(FollowTask task, LocalDateTime nextTime, LocalDateTime nextEndTime, String note) {
+        if (Objects.isNull(nextTime)) {
+            return;
+        }
         // TODO: 2022/1/17
     }
 }
@@ -18,6 +18,7 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
  
 import static cn.fw.common.businessvalidator.Validator.BV;
  
@@ -89,6 +90,9 @@ public class CFFollowStrategy extends AbstractFollowStrategy {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createNewRecord(FollowTask task, LocalDateTime nextTime, LocalDateTime nextEndTime, String note) {
+        if (Objects.isNull(nextTime)) {
+            return;
+        }
         int count = followRecordService.count(Wrappers.<FollowRecord>lambdaQuery()
                 .eq(FollowRecord::getTaskId, task.getId())
                 .eq(FollowRecord::getUserId, task.getFollowUser())
@@ -18,6 +18,7 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
  
 import static cn.fw.common.businessvalidator.Validator.BV;
  
@@ -89,6 +90,9 @@ public class PFFollowStrategy extends AbstractFollowStrategy {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createNewRecord(FollowTask task, LocalDateTime nextTime, LocalDateTime nextEndTime, String note) {
+        if (Objects.isNull(nextTime)) {
+            return;
+        }
         int count = followRecordService.count(Wrappers.<FollowRecord>lambdaQuery()
                 .eq(FollowRecord::getTaskId, task.getId())
                 .eq(FollowRecord::getUserId, task.getFollowUser())