diff --git a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java b/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java index d23f54e..7a1be1f 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java +++ b/admin/src/main/java/com/baiye/modules/distribute/dto/ClueDTO.java @@ -80,7 +80,10 @@ public class ClueDTO { @Schema(title = "渠道类型渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") private Integer channelType; - public ClueDTO(Long clueId, String originName, String nid, String remark, String otherClue, Long assignedBy, String assignedName, Long createBy, Boolean isNewClue, Long companyId, Integer sex, String customInformation, List channelIdentifying, Integer channelType) { + @Schema(title = "客户ID") + private Long customId; + + public ClueDTO(Long clueId, String originName, String nid, String remark, String otherClue, Long assignedBy, String assignedName, Long createBy, Boolean isNewClue, Long companyId, Integer sex, String customInformation, List channelIdentifying, Integer channelType, Long customId) { this.clueId = clueId; this.originName = originName; this.nid = nid; @@ -95,5 +98,6 @@ public class ClueDTO { this.customInformation = customInformation; this.channelIdentifying = channelIdentifying; this.channelType = channelType; + this.customId = customId; } } diff --git a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java index 706261b..9db956d 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java +++ b/admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java @@ -87,4 +87,7 @@ public class ClueEntity extends LogicDeletedBaseEntity { @Schema(title = "渠道类型渠道类型(1 手动创建 2文件上传 3飞鱼回传 4话单回传 5 api回传)") private Integer channelType; + + @Schema(title = "客户ID") + private Long customId; } diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java index 9e142fe..4b74986 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/ClueMapper.java @@ -64,6 +64,7 @@ public interface ClueMapper extends ExtendMapper { .likeIfPresent(ClueEntity::getClueLabelName, qo.getClueLabelName()) .eqIfPresent(ClueEntity::getAssignedBy, qo.getAssignedBy()) .eqIfPresent(ClueEntity::getCompanyId, qo.getCompanyId()) + .eqIfPresent(ClueEntity::getCustomId, qo.getCustomId()) .inIfPresent(ClueEntity::getAssignedBy, (Object[]) qo.getSalesmanArray()) .orderByDesc(ClueEntity::getCreateTime); if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) { @@ -80,4 +81,5 @@ public interface ClueMapper extends ExtendMapper { List distributorsAssignedClueByTime(@Param("qo") HomePageQo homePageQo); + List findCustomId(@Param("assignedBy") Long assignedBy, @Param("createBy")Long createBy); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java index aa41582..bca3fe7 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java +++ b/admin/src/main/java/com/baiye/modules/distribute/mapper/CustomMapper.java @@ -56,7 +56,8 @@ public interface CustomMapper extends ExtendMapper { .eqIfPresent(CustomEntity::getType, qo.getType()) .eqIfPresent(CustomEntity::getDistributorId, qo.getDistributorId()) .gtIfPresent(CustomEntity::getEnrollStatus, qo.getGreaterStatus()) - .eqIfPresent(CustomEntity::getEnrollStatus, qo.getEnrollStatus()); + .eqIfPresent(CustomEntity::getEnrollStatus, qo.getEnrollStatus()) + .inIfPresent(CustomEntity::getCustomId, qo.getCustomIds()); if (StringUtils.isNotBlank(qo.getDistributeStartTime()) && StringUtils.isNotBlank(qo.getDistributeEndTime())) { wrapperX.between(CustomEntity::getDistributeTime, qo.getDistributeStartTime(), qo.getDistributeEndTime()); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java index 994b1e6..3f415fa 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java +++ b/admin/src/main/java/com/baiye/modules/distribute/qo/ClueQo.java @@ -34,8 +34,9 @@ public class ClueQo { @Schema(title = "业务类型") private Integer salesmanType; - @Schema(title = "业务员id") private Long[] salesmanArray; + @Schema(title = "客户ID") + private Long customId; } diff --git a/admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java b/admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java index d943fbf..a0b8c44 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java +++ b/admin/src/main/java/com/baiye/modules/distribute/qo/CustomQo.java @@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springdoc.api.annotations.ParameterObject; +import java.util.List; + @Data @Schema(title = "客户查询对象") @ParameterObject @@ -60,4 +62,10 @@ public class CustomQo { @Schema(description = "审核类型 2初审 3复审") private Integer type; + + @Schema(title = "业务员ID") + private Long salesmanUserId; + + @Schema(title = "客户ID集合") + private List customIds; } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java b/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java index db08863..5f63f22 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/ClueService.java @@ -58,4 +58,11 @@ public interface ClueService extends ExtendService { * @return */ Boolean changeEffective(Long id, Integer effective); + + /** + * 查询客户ID + * @param assignedBy 分配用户ID + * @param createBy 创建人 + */ + List findCustomId(Long assignedBy, Long createBy); } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java index 1ef946b..ab8ea8d 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/ClueServiceImpl.java @@ -209,7 +209,6 @@ public class ClueServiceImpl extends ExtendServiceImpl i @Override public List queryList(ClueQo qo) { // 扩展数据 - if (qo.getNid() != null) { qo.setNid(AESUtils.encrypt(qo.getNid(), securityProperties.getPasswordSecretKey())); } @@ -234,4 +233,9 @@ public class ClueServiceImpl extends ExtendServiceImpl i return SqlHelper.retBool(this.baseMapper.update(null,wrapper)); } + @Override + public List findCustomId(Long assignedBy, Long createBy) { + return baseMapper.findCustomId(assignedBy, createBy); + } + } diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java index fa093a3..0e31eca 100644 --- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java +++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java @@ -16,9 +16,11 @@ import com.baiye.modules.distribute.entity.CustomEntity; import com.baiye.modules.distribute.entity.CustomStoreEntity; import com.baiye.modules.distribute.entity.StoreEntity; import com.baiye.modules.distribute.mapper.CustomMapper; +import com.baiye.modules.distribute.qo.ClueQo; import com.baiye.modules.distribute.qo.CustomQo; import com.baiye.modules.distribute.service.*; import com.baiye.modules.distribute.vo.AddressDTO; +import com.baiye.modules.distribute.vo.ClueVO; import com.baiye.modules.distribute.vo.CustomStoreVO; import com.baiye.modules.distribute.vo.CustomVO; import com.baiye.polling.QueueBalance; @@ -78,6 +80,10 @@ public class CustomServiceImpl extends ExtendServiceImpl queryPage(PageParam pageParam, CustomQo qo) { + if (qo.getSalesmanType() == DefaultNumberConstants.TWO_NUMBER && qo.getSalesmanUserId() != null){ + List customIdList = clueService.findCustomId(qo.getSalesmanUserId(), SecurityUtils.getCurrentUserId()); + qo.setCustomIds(customIdList); + } return baseMapper.queryPage(pageParam, qo); } @@ -113,6 +119,13 @@ public class CustomServiceImpl extends ExtendServiceImpl clueVOS = clueService.queryList(clueQo); + if (CollUtil.isNotEmpty(clueVOS)){ + customVO.setUserNameList(clueVOS.stream().map(ClueVO::getAssignedName).collect(Collectors.toList())); + } } List customStoreVOList = new ArrayList<>(); @@ -176,7 +189,7 @@ public class CustomServiceImpl extends ExtendServiceImpl salesmanUserId; + + @Schema(title = "业务员用户名") + private List userNameList; } diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml index 08ea218..d588a75 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: application: name: @artifactId@ profiles: - active: prod + active: dev # 天爱图形验证码 diff --git a/admin/src/main/resources/mapper/ClueMapper.xml b/admin/src/main/resources/mapper/ClueMapper.xml index 41d72e1..75f13d0 100644 --- a/admin/src/main/resources/mapper/ClueMapper.xml +++ b/admin/src/main/resources/mapper/ClueMapper.xml @@ -97,4 +97,12 @@ GROUP BY createTime + +