feature(*): 新增查询进行中待办数量的接口

- 新增查询进行中待办数量的接口

feature(*): 新增查询进行中待办数量的接口
- 新增查询进行中待办数量的接口
张志伟
1 parent 6b1e138d
Showing 15 changed files with 76 additions and 10 deletions
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/api/FollowApiService.java
fw-shirasawa-sdk/src/main/java/cn/fw/shirasawa/sdk/mq/FollowResultDTO.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-gray.yml
fw-shirasawa-server/src/main/resources/application-prd.yml
fw-shirasawa-server/src/main/resources/application-test.yml
fw-shirasawa-server/src/main/resources/application.yml
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/CustomEventListener.java
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/ACFollowStrategy.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/data/FollowRecordService.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/data/impl/FollowRecordServiceImpl.java
lombok.config
@@ -23,6 +23,7 @@ public interface FollowApiService {
     /**
      * 保存会产生跟进的业务数据
      * 事故车的场景联系方式不能为空
+     *
      * @param generateDTO
      * @return
      */
@@ -33,6 +34,7 @@ public interface FollowApiService {
      * 批量保存
      * 最多支持1000条
      * 事故车的场景联系方式不能为空
+     *
      * @param paramList
      * @return
      */
@@ -87,12 +89,23 @@ public interface FollowApiService {
     Message<Void> terminationBatch(@Valid @RequestBody CustomList<TerminationDTO> paramList);
     /**
-     *  根据类型和档案id查询已完成的跟进记录
-     * @param bizType  跟进业务类型 1-售前  2-售后
+     * 根据类型和档案id查询已完成的跟进记录
+     *
+     * @param bizType    跟进业务类型 1-售前  2-售后
      * @param customerId 档案id
      * @return
      */
     @GetMapping("/getCompletedFollowRecord")
     Message<List<SucessFollowRecordVo>> getCompletedFollowRecord(@RequestParam("bizType") @NotNull(message = "业务类型不能为空！") Integer bizType,
-                                                               @RequestParam("customerId") @NotEmpty(message = "档案id不能为空！") List<Long> customerId);
+                                                                 @RequestParam("customerId") @NotEmpty(message = "档案id不能为空！") List<Long> customerId);
+
+    /**
+     * 查询用户剩余待办数
+     * @param userId 用户id
+     * @param bizType 业态类型 {@link cn.fw.shirasawa.sdk.enums.BusinessTypeEnum}
+     * @return
+     */
+    @GetMapping("/query_record_remaining")
+    Message<Long> queryRecordRemaining(@RequestParam("userId") @NotNull(message = "userId不能为空！") Long userId,
+                                       @RequestParam("bizType") @NotNull(message = "业务类型不能为空！") Integer bizType);
 }
 \ No newline at end of file
@@ -65,4 +65,8 @@ public class FollowResultDTO {
      * 跟进待办id
      */
     private Long recordId;
+    /**
+     * 剩余待办数量
+     */
+    private Long remaining;
 }
@@ -171,4 +171,14 @@ public class FollowApiServiceImpl implements FollowApiService {
                                                                         @RequestParam("customerId") @NotEmpty(message = "档案id不能为空！") List<Long> customerId) {
         return success(followBizService.getCompletedFollowRecord(bizType, customerId));
     }
+
+    @Override
+    @GetMapping("/query_record_remaining")
+    @ControllerMethod("查询用户剩余待办数")
+    public Message<Long> queryRecordRemaining(@RequestParam("userId") @NotNull(message = "userId不能为空！") Long userId,
+                                              @RequestParam("bizType") @NotNull(message = "业务类型不能为空！") Integer bizType) {
+        BusinessTypeEnum businessType = BusinessTypeEnum.ofValue(bizType);
+        BV.notNull(businessType, () -> "业务类型不正确");
+        return success(followBizService.queryOngoingRecord(userId, businessType));
+    }
 }
@@ -94,7 +94,6 @@ public class FollowController {
     }
     /**
-     * showdoc
      * 跟进记录id不能为空
      *
      * @param userId
@@ -56,7 +56,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
-    SFCode: ''
+    SFCode: 't8nlNVPNGp'
   FmTemplateCode: 'SMS_215116996'
   RmTemplateCode: 'SMS_215072079'
   IrTemplateCode: ''
@@ -55,7 +55,7 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
-    SFCode: ''
+    SFCode: 't8nlNVPNGp'
   FmTemplateCode: 'SMS_215116996'
   RmTemplateCode: 'SMS_215072079'
   IrTemplateCode: ''
@@ -66,7 +66,6 @@ follow:
     PFCode: 'O6zZjZ17st'
     FACode: ''
     RVCode: ''
-    SFCode: ''
   FmTemplateCode: ''
   RmTemplateCode: ''
   IrTemplateCode: ''
 \ No newline at end of file
@@ -145,7 +145,7 @@ follow:
     FACode: ''
     RVCode: ''
     PLCode: ''
-    SFCode: ''
+    SFCode: 't8nlNVPNGp'
   FmTemplateCode: ''
   RmTemplateCode: ''
   IrTemplateCode: ''
@@ -13,6 +13,7 @@ import cn.fw.shirasawa.rpc.flow.FlowApproveRpc;
 import cn.fw.shirasawa.sdk.mq.FollowResultDTO;
 import cn.fw.shirasawa.service.data.ApproveRecordService;
 import cn.fw.shirasawa.service.data.CluePoolService;
+import cn.fw.shirasawa.service.data.FollowRecordService;
 import cn.fw.shirasawa.service.data.FollowTaskService;
 import cn.fw.shirasawa.service.event.CancelApproveEvent;
 import cn.fw.shirasawa.service.event.RecordCompleteEvent;
@@ -38,6 +39,7 @@ public class CustomEventListener {
     private final ApproveRecordService approveRecordService;
     private final FlowApproveRpc flowApproveRpc;
     private final CluePoolService cluePoolService;
+    private final FollowRecordService followRecordService;
     private final RecordResultProducer recordResultProducer;
     /**
@@ -86,6 +88,7 @@ public class CustomEventListener {
             if (Objects.isNull(cluePool)) {
                 return;
             }
+            long remaining = followRecordService.recordRemaining(record.getUserId(), record.getBizType(), record.getId());
             FollowResultDTO dto = new FollowResultDTO();
             dto.setCustomerId(record.getCustomerId());
             dto.setRecordId(record.getId());
@@ -95,6 +98,7 @@ public class CustomEventListener {
             dto.setUserName(record.getUserName());
             dto.setShopId(record.getShopId());
             dto.setGroupId(record.getGroupId());
+            dto.setRemaining(remaining);
             boolean ov = OutTimeEnum.BE_OVERDUE.equals(record.getOutTime());
             dto.setOverdue(ov);
             dto.setResultTime(DateUtil.toDate(ov ? record.getDeadline().minusSeconds(1L) : record.getFollowTime()));
@@ -992,6 +992,17 @@ public class FollowBizService {
     }
     /**
+     * 查询未完成的待办数量
+     *
+     * @param userId
+     * @param bizType
+     * @return
+     */
+    public long queryOngoingRecord(Long userId, BusinessTypeEnum bizType) {
+        return followRecordService.recordRemaining(userId, bizType, null);
+    }
+
+    /**
      * 创建新跟进
      *
      * @param newRecordDTO
@@ -132,7 +132,6 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         BackLogItemDTO dto = new BackLogItemDTO(record.getUserId(), record.getTodoCode(), String.valueOf(record.getId()),
                 DateUtil.toDate(record.getFollowTime()), record.getShopId());
         todoRpcService.complete(dto);
-
         eventPublisher.publishEvent(new RecordCompleteEvent(record, task.getClueId()));
     }
@@ -12,7 +12,6 @@ import cn.fw.shirasawa.domain.enums.ClueStatusEnum;
 import cn.fw.shirasawa.domain.enums.FollowTypeEnum;
 import cn.fw.shirasawa.domain.enums.OutTimeEnum;
 import cn.fw.shirasawa.domain.vo.follow.ACDetailVO;
-import cn.fw.shirasawa.domain.vo.follow.FollowDetailVO;
 import cn.fw.shirasawa.rpc.backlog.dto.BackLogItemDTO;
 import cn.fw.shirasawa.rpc.valhalla.ValhallaRpcService;
 import cn.fw.shirasawa.rpc.valhalla.dto.ValhallaCustomerDTO;
@@ -4,7 +4,9 @@ import cn.fw.shirasawa.domain.db.follow.FollowRecord;
 import cn.fw.shirasawa.domain.db.follow.SucessFollowRecord;
 import cn.fw.shirasawa.domain.dto.FollowRecordPoolDTO;
 import cn.fw.shirasawa.domain.query.FollowRecordPoolQuery;
+import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.lang.Nullable;
 import java.util.List;
@@ -83,4 +85,13 @@ public interface FollowRecordService extends IService&lt;FollowRecord&gt; {
      */
     List<FollowRecordPoolDTO> recordPoolList(FollowRecordPoolQuery query);
+    /**
+     * 查询用未完成的剩余跟进数量
+     *
+     * @param userId
+     * @param bizType
+     * @param recordId 排除记录的id [nullable]
+     * @return
+     */
+    long recordRemaining(Long userId, BusinessTypeEnum bizType, @Nullable Long recordId);
 }
@@ -6,16 +6,19 @@ import cn.fw.shirasawa.domain.db.follow.SucessFollowRecord;
 import cn.fw.shirasawa.domain.dto.FollowRecordPoolDTO;
 import cn.fw.shirasawa.domain.enums.OutTimeEnum;
 import cn.fw.shirasawa.domain.query.FollowRecordPoolQuery;
+import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum;
 import cn.fw.shirasawa.service.data.FollowRecordService;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 /**
@@ -109,4 +112,16 @@ public class FollowRecordServiceImpl extends ServiceImpl&lt;FollowRecordMapper, Fol
         List<FollowRecordPoolDTO> list = this.getBaseMapper().recordPoolList(startIndex, pageSize, query);
         return Optional.ofNullable(list).orElse(new ArrayList<>());
     }
+
+    @Override
+    public long recordRemaining(Long userId, BusinessTypeEnum bizType, @Nullable Long recordId) {
+        return count(Wrappers.<FollowRecord>lambdaQuery()
+                .eq(FollowRecord::getUserId, userId)
+                .eq(FollowRecord::getBizType, bizType)
+                .eq(FollowRecord::getOutTime, OutTimeEnum.ONGOING)
+                .eq(FollowRecord::getYn, Boolean.TRUE)
+                .eq(FollowRecord::getAddTodo, Boolean.TRUE)
+                .ne(Objects.nonNull(recordId), FollowRecord::getId, recordId)
+        );
+    }
 }
+config.stopBubbling = true
+lombok.accessors.chain=true