线索阶段搜索字段添加和状态添加

ad-platform-gateway/src/main/resources/bootstrap.yml

@@ -7,8 +7,8 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848}
+#        server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848}
-        #server-addr: ${NACOS_HOST:172.16.190.245}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:172.16.190.245}:${NACOS_PORT:8848}
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml

ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java

@@ -68,4 +68,7 @@ public class ClueQueryCriteria {
     @ApiModelProperty(value = "线索阶段：0：新线索 1：待沟通 2：有意向 3：已加微信 4：无意向")
     private Integer clueStage;
 
+    @ApiModelProperty(value = "手机号")
+    private String nid;
+
 }

services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java

@@ -99,7 +99,7 @@ public class ClueController {
         return CommonResponse.createBySuccess();
     }
 
-    @ApiOperation("资源id批量更新人员(分配)")
+    @ApiOperation("资源id批量更新人员(动态任务分配)")
     @PostMapping("/updateBatchMember")
     public CommonResponse<Object> updateBatchMember(@RequestBody ClueQueryCriteria clueQueryCriteria) {
         clueService.updateBatchMember(clueQueryCriteria);

services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java

@@ -133,7 +133,7 @@ public interface ClueMiddleRepository extends JpaRepository<ClueMiddle, Long>, J
     void deleteByTaskIdIn(Set<Long> taskIds);
 
     @Modifying
-    @Query(value = " update tb_clue_middle set member_id = ?2, member_status = 1 where clue_id in ?1 ", nativeQuery = true)
+    @Query(value = " update tb_clue_middle set member_id = ?2, member_status = 0 where clue_id in ?1 ", nativeQuery = true)
     void updateMemberIdByClueIdIn(List<Long> clueIdList, Long userId);
 
     @Query(value = "select clue_id from tb_clue_middle where task_id = ?1", nativeQuery = true)

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -155,7 +155,7 @@ public class ClueServiceImpl implements ClueService {
                     if (clueQueryCriteria.getMemberId() != null) {
                         clueMiddleRepository.updateUserIdExceptStatus(clueIdList, userId);
                     } else {
-                        clueMiddleRepository.updateUserId(clueIdList, DefaultNumberConstants.ONE_NUMBER, userId);
+                        clueMiddleRepository.updateUserId(clueIdList, DefaultNumberConstants.ZERO_NUMBER, userId);
                     }
                 }
             }
@@ -168,8 +168,12 @@ public class ClueServiceImpl implements ClueService {
      */
     @Override
     public Map<String, Object> queryAll(ClueQueryCriteria clueQueryCriteria, Pageable pageable) {
+        String nid = clueQueryCriteria.getNid();
         if (clueQueryCriteria.getMemberId() != null) {
             List<ClueDto> clueDtoList = clueJpa.getClueList(clueQueryCriteria, pageable);
+            if (StringUtils.isNotBlank(nid)){ //手机号搜索
+                clueDtoList = clueDtoList.stream().filter(ct -> ct.getNid().contains(nid)).collect(Collectors.toList());
+            }
             Long count = clueJpa.getCount(clueQueryCriteria);
             //查询线索记录
             Set<Long> clueIdList = clueDtoList.stream().map(ClueDto::getId).collect(Collectors.toSet());
@@ -300,6 +304,9 @@ public class ClueServiceImpl implements ClueService {
         if (clueMiddle.getClueStage() != null) {
             clueMiddleOne.setClueStage(clueMiddle.getClueStage());
             clueMiddleOne.setClueStageTime(DateUtil.date());
+            if (clueMiddleOne.getMemberStatus() != DefaultNumberConstants.TWO_NUMBER){
+                clueMiddleOne.setMemberStatus(DefaultNumberConstants.ONE_NUMBER); //线索跟进状态修改
+            }
         }
         if (clueMiddle.getClueCallStatus() != null) {
             clueMiddleOne.setClueCallStatus(clueMiddle.getClueCallStatus());