diff --git a/ad-platform-gateway/src/main/resources/bootstrap.yml b/ad-platform-gateway/src/main/resources/bootstrap.yml index 0fa31f8e..23ec22b2 100644 --- a/ad-platform-gateway/src/main/resources/bootstrap.yml +++ b/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:172.16.190.245}:${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} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml diff --git a/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java b/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java index 9d7544df..87ff6ea5 100644 --- a/ad-platform-pojo/src/main/java/com/baiye/model/dto/ClueQueryCriteria.java +++ b/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; + } diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java b/services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java index 8386b6e8..d67e1663 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java +++ b/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 updateBatchMember(@RequestBody ClueQueryCriteria clueQueryCriteria) { clueService.updateBatchMember(clueQueryCriteria); diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java b/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java index 009d67cf..cc389c8e 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueMiddleRepository.java @@ -133,7 +133,7 @@ public interface ClueMiddleRepository extends JpaRepository, J void deleteByTaskIdIn(Set 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 clueIdList, Long userId); @Query(value = "select clue_id from tb_clue_middle where task_id = ?1", nativeQuery = true) diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index 6b670c65..99fcbb39 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/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 queryAll(ClueQueryCriteria clueQueryCriteria, Pageable pageable) { + String nid = clueQueryCriteria.getNid(); if (clueQueryCriteria.getMemberId() != null) { List 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 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());