feature(*): 修复成交池查询

- 修复成交池查询

feature(*): 修复成交池查询
- 修复成交池查询
张志伟
1 parent 755a1f60
Showing 7 changed files with 238 additions and 16 deletions
fw-valhalla-dao/src/main/java/cn/fw/valhalla/dao/mapper/PubCluePoolMapper.java
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-dao/src/main/resources/mapper/PubCluePoolMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/FollowPoolDTO.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/PubCluePoolService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/PubCluePoolServiceImpl.java
 package cn.fw.valhalla.dao.mapper;
  
 import cn.fw.valhalla.domain.db.pub.PubCluePool;
+import cn.fw.valhalla.domain.dto.FollowPoolDTO;
+import cn.fw.valhalla.domain.query.FollowPoolQueryVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
  
+import java.util.List;
+
 /**
  * 公共池线索
  *
@@ -15,4 +20,21 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface PubCluePoolMapper extends BaseMapper<PubCluePool> {
+    /**
+     * 跟进池
+     *
+     * @param startIndex
+     * @param pageSize
+     * @param queryVO
+     * @return
+     */
+    List<FollowPoolDTO> followList(@Param("startIndex") Integer startIndex, @Param("pageSize") Integer pageSize, @Param("condition") FollowPoolQueryVO queryVO);
+
+    /**
+     * 查询跟进池总数
+     *
+     * @param queryVO
+     * @return
+     */
+    Long followListCount(@Param("condition") FollowPoolQueryVO queryVO);
 }
@@ -24,7 +24,6 @@
         t3.arrival_time arrival_time,
         IFNULL(t1.times, 0) times,
         TIMESTAMPDIFF(HOUR, now(), t1.deadline) remaining,
-        t1.redistribution redistribution,
         t1.state state,
         t1.close_time close_time,
         t1.reason initiative,
@@ -37,6 +36,7 @@
         left join customer_loan_info t2 on t6.vin = t2.frame_no and t6.group_id = t2.group_id
         <where>
             t1.group_id = #{condition.groupId}
+            and t1.tye != 10
             <if test="condition.userId !=null">
                 and t1.follow_user = #{condition.userId}
             </if>
@@ -90,9 +90,6 @@
                 </trim>
                 ))
             </if>
-            <if test="condition.redistribution !=null">
-                and t1.redistribution = #{condition.redistribution}
-            </if>
             <if test="condition.initiative !=null">
                 and t1.reason = #{condition.initiative}
             </if>
@@ -120,6 +117,7 @@
         left join customer_loan_info t2 on t6.vin = t2.frame_no and t6.group_id = t2.group_id
         <where>
             t1.group_id = #{condition.groupId}
+            and t1.tye != 10
             <if test="condition.userId !=null">
                 and t1.follow_user = #{condition.userId}
             </if>
@@ -173,9 +171,6 @@
                     </trim>
                 ))
             </if>
-            <if test="condition.redistribution !=null">
-                and t1.redistribution = #{condition.redistribution}
-            </if>
             <if test="condition.initiative !=null">
                 and t1.reason = #{condition.initiative}
             </if>
@@ -201,6 +196,7 @@
         inner join follow_clue t2 on t1.clue_id = t2.id
         <where>
             t1.redistribution = 0
+            and t1.type != 10
             <if test="condition.type !=null">
                 and t1.type = #{condition.type}
             </if>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.fw.valhalla.dao.mapper.PubCluePoolMapper">
+    <select
+            id="followList"
+            resultType="cn.fw.valhalla.domain.dto.FollowPoolDTO"
+            parameterType="cn.fw.valhalla.domain.query.FollowPoolQueryVO"
+    >
+        SELECT t1.id,
+        t3.plate_no plate_no,
+        t3.frame_no frame_no,
+        t5.mobile mobile,
+        t3.cus_level cus_level,
+        t2.expires loan_expires,
+        t1.type type,
+        t1.follow_user user_id,
+        t1.follow_user_name follow_user_name,
+        t1.follow_shop shop_id,
+        t1.finish_shop finish_shop,
+        t1.finish_user_name finish_user_name,
+        t1.create_time start_time,
+        t3.buy_date buy_date,
+        t3.insurance_expires insurance_expires,
+        t3.arrival_time arrival_time,
+        IFNULL(t1.times, 0) times,
+        TIMESTAMPDIFF(HOUR, now(), t1.deadline) remaining,
+        t1.state state,
+        t1.close_time close_time,
+        t1.reason initiative,
+        t1.group_id group_id
+        FROM clue_task t1
+        left join pub_clue_pool t6 on t1.clue_id=t6.id
+        left join customer t3 on t6.vin = t3.frame_no and t6.group_id = t3.group_id and t3.yn=1
+        left join customer_base_info t5 on t3.base_id = t5.id
+        left join customer_loan_info t2 on t6.vin = t2.frame_no and t6.group_id = t2.group_id
+        <where>
+            t1.group_id = #{condition.groupId}
+            and t1.type = 10
+            <if test="condition.userId !=null">
+                and t1.follow_user = #{condition.userId}
+            </if>
+            <if test="condition.userName !=null and condition.userName != ''">
+                and t1.follow_user_name like concat('%',#{condition.userName},'%')
+            </if>
+            <if test="condition.plateNo != null and condition.plateNo !='' ">
+                and (t3.plate_no like concat('%', #{condition.plateNo}, '%') or t4.plate_no like concat('%',
+                #{condition.plateNo}, '%'))
+            </if>
+            <if test="condition.frameNo != null and condition.frameNo !='' ">
+                and t6.vin like concat('%', #{condition.frameNo}, '%')
+            </if>
+
+            <if test="condition.shopIds !=null">
+                and t1.follow_shop in
+                <foreach collection="condition.shopIds" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="condition.state != null">
+                and t1.state in
+                <foreach collection="condition.state" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="condition.loanCustomer !=null and condition.loanCustomer == 1">
+                and t2.expires > now()
+            </if>
+            <if test="condition.loanCustomer !=null and condition.loanCustomer == 0">
+                and (t2.expires is null or t2.expires &lt;= now())
+            </if>
+            <if test="condition.startTime1 !=null">
+                and t1.create_time >= #{condition.startTime1}
+            </if>
+            <if test="condition.startTime2 !=null">
+                and t1.create_time &lt;= #{condition.startTime2}
+            </if>
+            <if test="condition.closeTime1 !=null or condition.closeTime2 !=null">
+                and ( t1.close_time is null or (
+                <trim prefixOverrides="and">
+                    <if test="condition.closeTime1 !=null">
+                        and t1.close_time >= #{condition.closeTime1}
+                    </if>
+                    <if test="condition.closeTime2 !=null">
+                        and t1.close_time &lt;= #{condition.closeTime2}
+                    </if>
+                </trim>
+                ))
+            </if>
+            <if test="condition.initiative !=null">
+                and t1.reason = #{condition.initiative}
+            </if>
+            <if test="condition.ignoreChangeRole != null">
+                and (t1.reason is null or t1.reason not in (4))
+            </if>
+        </where>
+        <if test="condition.orderString != null and condition.orderString !='' ">
+            ${condition.orderString}
+        </if>
+        limit #{startIndex},#{pageSize};
+    </select>
+
+    <select
+            id="followListCount"
+            resultType="java.lang.Long"
+            parameterType="cn.fw.valhalla.domain.query.FollowPoolQueryVO"
+    >
+        SELECT count(t1.id)
+        FROM clue_task t1
+        left join pub_clue_pool t6 on t1.clue_id=t6.id
+        left join customer t3 on t6.vin = t3.frame_no and t6.group_id = t3.group_id and t3.yn=1
+        left join customer_base_info t5 on t3.base_id = t5.id
+        left join customer_loan_info t2 on t6.vin = t2.frame_no and t6.group_id = t2.group_id
+        <where>
+            t1.group_id = #{condition.groupId}
+            and t1.type = 10
+            <if test="condition.userId !=null">
+                and t1.follow_user = #{condition.userId}
+            </if>
+            <if test="condition.userName !=null and condition.userName != ''">
+                and t1.follow_user_name like concat('%',#{condition.userName},'%')
+            </if>
+            <if test="condition.plateNo != null and condition.plateNo !='' ">
+                and (t3.plate_no like concat('%', #{condition.plateNo}, '%') or t4.plate_no like concat('%',
+                #{condition.plateNo}, '%'))
+            </if>
+            <if test="condition.frameNo != null and condition.frameNo !='' ">
+                and t6.vin like concat('%', #{condition.frameNo}, '%')
+            </if>
+
+            <if test="condition.shopIds !=null">
+                and t1.follow_shop in
+                <foreach collection="condition.shopIds" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="condition.state != null">
+                and t1.state in
+                <foreach collection="condition.state" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="condition.loanCustomer !=null and condition.loanCustomer == 1">
+                and t2.expires > now()
+            </if>
+            <if test="condition.loanCustomer !=null and condition.loanCustomer == 0">
+                and (t2.expires is null or t2.expires &lt;= now())
+            </if>
+            <if test="condition.startTime1 !=null">
+                and t1.create_time >= #{condition.startTime1}
+            </if>
+            <if test="condition.startTime2 !=null">
+                and t1.create_time &lt;= #{condition.startTime2}
+            </if>
+            <if test="condition.closeTime1 !=null or condition.closeTime2 !=null">
+                and ( t1.close_time is null or (
+                <trim prefixOverrides="and">
+                    <if test="condition.closeTime1 !=null">
+                        and t1.close_time >= #{condition.closeTime1}
+                    </if>
+                    <if test="condition.closeTime2 !=null">
+                        and t1.close_time &lt;= #{condition.closeTime2}
+                    </if>
+                </trim>
+                ))
+            </if>
+            <if test="condition.initiative !=null">
+                and t1.reason = #{condition.initiative}
+            </if>
+            <if test="condition.ignoreChangeRole != null">
+                and (t1.reason is null or t1.reason not in (4))
+            </if>
+        </where>
+    </select>
 </mapper>
@@ -69,10 +69,7 @@ public class FollowPoolDTO {
      * 剩余天数
      */
     private Integer remaining;
-    /**
-     * 二次跟进
-     */
-    private Boolean redistribution;
+
     /**
      * 状态 1：进行中 2：已成交 3：战败
      */
@@ -47,6 +47,7 @@ public class PoolBizService {
     private final AffiliationRecordService affiliationRecordService;
     private final OrderRpcService orderRpcService;
     private final ClueTaskService clueTaskService;
+    private final PubCluePoolService pubCluePoolService;
     private final FollowClueService followClueService;
  
  
@@ -59,12 +60,23 @@ public class PoolBizService {
     public AppPage<FollowPoolListVO> followList(LoginAuthBean user, FollowPoolQueryVO queryVO) {
         prepareParams(user, queryVO);
         AppPageVO<FollowPoolListVO> page = AppPageVO.init(queryVO);
-        final long total = clueTaskService.followListCount(queryVO);
-        if (total <= 0) {
-            return page;
+        List<FollowPoolDTO> list;
+        if (FollowTypeEnum.PL.getValue().equals(queryVO.getType())) {
+            final long total = pubCluePoolService.followListCount(queryVO);
+            if (total <= 0) {
+                return page;
+            }
+            page.setTotal(total);
+            list = pubCluePoolService.followList(queryVO);
+        } else {
+            final long total = clueTaskService.followListCount(queryVO);
+            if (total <= 0) {
+                return page;
+            }
+            page.setTotal(total);
+            list = clueTaskService.followList(queryVO);
         }
-        page.setTotal(total);
-        List<FollowPoolDTO> list = clueTaskService.followList(queryVO);
+
         List<FollowPoolListVO> followList = new ArrayList<>();
         for (FollowPoolDTO followPoolDTO : list) {
             FollowPoolListVO vo = trans2FollowPool(followPoolDTO);
 package cn.fw.valhalla.service.data;
  
 import cn.fw.valhalla.domain.db.pub.PubCluePool;
+import cn.fw.valhalla.domain.dto.FollowPoolDTO;
+import cn.fw.valhalla.domain.query.FollowPoolQueryVO;
 import com.baomidou.mybatisplus.extension.service.IService;
  
+import java.util.List;
+
 /**
  * 公共池线索
  *
@@ -13,4 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @date : 2023-03-20 10:36
  */
 public interface PubCluePoolService extends IService<PubCluePool> {
+    List<FollowPoolDTO> followList(FollowPoolQueryVO queryVO);
+
+    long followListCount(FollowPoolQueryVO queryVO);
 }
@@ -2,11 +2,17 @@ package cn.fw.valhalla.service.data.impl;
  
 import cn.fw.valhalla.dao.mapper.PubCluePoolMapper;
 import cn.fw.valhalla.domain.db.pub.PubCluePool;
+import cn.fw.valhalla.domain.dto.FollowPoolDTO;
+import cn.fw.valhalla.domain.query.FollowPoolQueryVO;
 import cn.fw.valhalla.service.data.PubCluePoolService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
  
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * 公共池线索
  *
@@ -19,4 +25,16 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class PubCluePoolServiceImpl extends ServiceImpl<PubCluePoolMapper, PubCluePool> implements PubCluePoolService {
+    @Override
+    public List<FollowPoolDTO> followList(FollowPoolQueryVO queryVO) {
+        Integer current = queryVO.getCurrent();
+        Integer pageSize = queryVO.getPageSize();
+        Integer startIndex = (current - 1) * pageSize;
+        return Optional.ofNullable(getBaseMapper().followList(startIndex, pageSize, queryVO)).orElse(new ArrayList<>());
+    }
+
+    @Override
+    public long followListCount(FollowPoolQueryVO queryVO) {
+        return Optional.ofNullable(getBaseMapper().followListCount(queryVO)).orElse(0L);
+    }
 }