feat(*): bug修复

- bug修复

feat(*): bug修复
- bug修复
张志伟
1 parent 6091f818
Showing 8 changed files with 53 additions and 6 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
fw-valhalla-sdk/pom.xml
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/api/FollowApiService.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/FollowApiServiceImpl.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/OriginDataDealTask.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowApiBizService.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
pom.xml
@@ -104,7 +104,6 @@
             </if>
             <if test="condition.ignoreChangeRole != null">
                 and (t1.reason is null or t1.reason not in (4))
-                and t1.redistribution = 0
             </if>
         </where>
         <if test="condition.orderString != null and condition.orderString !='' ">
@@ -194,7 +193,6 @@
             </if>
             <if test="condition.ignoreChangeRole != null">
                 and (t1.reason is null or t1.reason not in (4))
-                and t1.redistribution = 0
             </if>
         </where>
     </select>
@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>fw-valhalla-sdk</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.5</version>
     <packaging>jar</packaging>
     <name>fw-valhalla-sdk</name>
  
@@ -70,4 +70,13 @@ public interface FollowApiService {
      */
     @GetMapping("/car/inShop")
     Message<Void> carInShop(@RequestParam("plateNo") String plateNo, @RequestParam("groupId") Long groupId);
+
+    /**
+     * 查询车辆历史续保跟进人员
+     *
+     * @param vin     车架号
+     * @param groupId 集团id
+     */
+    @GetMapping("/ins/follower")
+    Message<List<Long>> queryInsFollower(@RequestParam("vin") String vin, @RequestParam("groupId") Long groupId);
 }
 \ No newline at end of file
@@ -94,4 +94,17 @@ public class FollowApiServiceImpl implements FollowApiService {
         followApiBizService.afterCarInShop(plateNo, groupId);
         return success();
     }
+
+    /**
+     * 查询车辆历史续保跟进人员
+     *
+     * @param vin     车架号
+     * @param groupId 集团id
+     */
+    @Override
+    @GetMapping("/ins/follower")
+    @ControllerMethod("车辆进站")
+    public Message<List<Long>> queryInsFollower(@RequestParam("vin") final String vin, @RequestParam("groupId") final Long groupId) {
+        return success(followApiBizService.queryInsFollower(vin, groupId));
+    }
 }
@@ -55,7 +55,7 @@ class OriginDataDealTask(
         val listOps = stringRedisTemplate.boundListOps(reachLogKey)
         listOps.size()?.takeIf { it > 0 }?.let {
             while (true) {
-                val dataStr = listOps.leftPop()?.takeIf { StringUtils.isEmpty(it) }
+                val dataStr = listOps.leftPop()
                 if (dataStr.isNullOrBlank()) {
                     break
                 }
@@ -151,4 +151,31 @@ class FollowApiBizService(
             followClueService.updateById(this)
         }
     }
+
+    fun queryInsFollower(vin: String, groupId: Long): List<Long> {
+        val clueList = followClueService.list(
+            Wrappers.lambdaQuery<FollowClue>()
+                .eq(FollowClue::getVin, vin)
+                .eq(FollowClue::getClueType, FollowTypeEnum.IR)
+                .`in`(
+                    FollowClue::getClueState,
+                    listOf(ClueStatusEnum.ONGOING, ClueStatusEnum.COMPLETE, ClueStatusEnum.FAILURE)
+                )
+                .eq(FollowClue::getGroupId, groupId)
+        )
+
+        if (clueList.isNullOrEmpty()) {
+            return mutableListOf()
+        }
+        val clueIds = clueList.map { it.id }
+        val taskList = clueTaskService.list(
+            Wrappers.lambdaQuery<ClueTask>()
+                .`in`(ClueTask::getClueId, clueIds)
+                .`in`(ClueTask::getState, TaskStateEnum.DEFEAT, TaskStateEnum.ONGOING)
+        )
+        if (taskList.isNullOrEmpty()) {
+            return mutableListOf()
+        }
+        return taskList.map { it.followUser }
+    }
 }
@@ -74,7 +74,7 @@ public class PoolBizService {
             page.setTotal(total);
             list = pubCluePoolService.followList(queryVO);
         } else {
-            queryVO.setIgnoreChangeRole(null);
+            queryVO.setIgnoreChangeRole(true);
             if (Boolean.TRUE.equals(queryVO.getClueDimension())) {
                 prepareClueDimensionQuery(queryVO);
             }
@@ -124,7 +124,7 @@
             <dependency>
                 <groupId>cn.fw</groupId>
                 <artifactId>fw-valhalla-sdk</artifactId>
-                <version>1.3.4</version>
+                <version>1.3.5</version>
             </dependency>
             <dependency>
                 <groupId>cn.fw</groupId>