refactor: CRM/数据统计/排行榜 重命名

This commit is contained in:
dhb52 2024-02-28 21:41:53 +08:00
parent 7d120a2f36
commit a0b413b3a3
7 changed files with 81 additions and 81 deletions

View File

@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.crm.controller.admin.statistics; package cn.iocoder.yudao.module.crm.controller.admin.statistics;
import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRankReqVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankReqVO;
import cn.iocoder.yudao.module.crm.service.statistics.CrmStatisticsRankingService; import cn.iocoder.yudao.module.crm.service.statistics.CrmStatisticsRankService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@ -19,69 +19,69 @@ import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - CRM 排行榜统计") @Tag(name = "管理后台 - CRM 数据统计 排行榜统计")
@RestController @RestController
@RequestMapping("/crm/statistics-rank") @RequestMapping("/crm/statistics-rank")
@Validated @Validated
public class CrmStatisticsRankController { public class CrmStatisticsRankController {
@Resource @Resource
private CrmStatisticsRankingService rankingService; private CrmStatisticsRankService rankService;
@GetMapping("/get-contract-price-rank") @GetMapping("/get-contract-price-rank")
@Operation(summary = "获得合同金额排行榜") @Operation(summary = "获得合同金额排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getContractPriceRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getContractPriceRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getContractPriceRank(rankingReqVO)); return success(rankService.getContractPriceRank(rankingReqVO));
} }
@GetMapping("/get-receivable-price-rank") @GetMapping("/get-receivable-price-rank")
@Operation(summary = "获得回款金额排行榜") @Operation(summary = "获得回款金额排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getReceivablePriceRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getReceivablePriceRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getReceivablePriceRank(rankingReqVO)); return success(rankService.getReceivablePriceRank(rankingReqVO));
} }
@GetMapping("/get-contract-count-rank") @GetMapping("/get-contract-count-rank")
@Operation(summary = "获得签约合同数量排行榜") @Operation(summary = "获得签约合同数量排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getContractCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getContractCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getContractCountRank(rankingReqVO)); return success(rankService.getContractCountRank(rankingReqVO));
} }
@GetMapping("/get-product-sales-rank") @GetMapping("/get-product-sales-rank")
@Operation(summary = "获得产品销量排行榜") @Operation(summary = "获得产品销量排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getProductSalesRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getProductSalesRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getProductSalesRank(rankingReqVO)); return success(rankService.getProductSalesRank(rankingReqVO));
} }
@GetMapping("/get-customer-count-rank") @GetMapping("/get-customer-count-rank")
@Operation(summary = "获得新增客户数排行榜") @Operation(summary = "获得新增客户数排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getCustomerCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getCustomerCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getCustomerCountRank(rankingReqVO)); return success(rankService.getCustomerCountRank(rankingReqVO));
} }
@GetMapping("/get-contacts-count-rank") @GetMapping("/get-contacts-count-rank")
@Operation(summary = "获得新增联系人数排行榜") @Operation(summary = "获得新增联系人数排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getContactsCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getContactsCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getContactsCountRank(rankingReqVO)); return success(rankService.getContactsCountRank(rankingReqVO));
} }
@GetMapping("/get-follow-count-rank") @GetMapping("/get-follow-count-rank")
@Operation(summary = "获得跟进次数排行榜") @Operation(summary = "获得跟进次数排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getFollowCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getFollowCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getFollowCountRank(rankingReqVO)); return success(rankService.getFollowCountRank(rankingReqVO));
} }
@GetMapping("/get-follow-customer-count-rank") @GetMapping("/get-follow-customer-count-rank")
@Operation(summary = "获得跟进客户数排行榜") @Operation(summary = "获得跟进客户数排行榜")
@PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')") @PreAuthorize("@ss.hasPermission('crm:statistics-rank:query')")
public CommonResult<List<CrmStatisticsRanKRespVO>> getFollowCustomerCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) { public CommonResult<List<CrmStatisticsRankRespVO>> getFollowCustomerCountRank(@Valid CrmStatisticsRankReqVO rankingReqVO) {
return success(rankingService.getFollowCustomerCountRank(rankingReqVO)); return success(rankService.getFollowCustomerCountRank(rankingReqVO));
} }
} }

View File

@ -1,4 +1,4 @@
package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo; package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
@ -11,7 +11,7 @@ import java.util.List;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - CRM 排行榜统计 Request VO") @Schema(description = "管理后台 - CRM 数据统计 排行榜统计 Request VO")
@Data @Data
public class CrmStatisticsRankReqVO { public class CrmStatisticsRankReqVO {
@ -21,7 +21,7 @@ public class CrmStatisticsRankReqVO {
/** /**
* userIds 目前不用前端传递目前是方便后端通过 deptId 读取编号后设置回来 * userIds 目前不用前端传递目前是方便后端通过 deptId 读取编号后设置回来
* * <p>
* 后续可能会支持选择部分用户进行查询 * 后续可能会支持选择部分用户进行查询
*/ */
@Schema(description = "负责人用户 id 集合", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2") @Schema(description = "负责人用户 id 集合", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2")

View File

@ -1,12 +1,12 @@
package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo; package cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@Schema(description = "管理后台 - CRM BI 排行榜统计 Response VO") @Schema(description = "管理后台 - CRM 数据统计 排行榜统计 Response VO")
@Data @Data
public class CrmStatisticsRanKRespVO { public class CrmStatisticsRankRespVO {
@Schema(description = "负责人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "负责人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long ownerUserId; private Long ownerUserId;
@ -19,7 +19,7 @@ public class CrmStatisticsRanKRespVO {
/** /**
* 数量是个特别抽象的概念在不同排行下代表不同含义 * 数量是个特别抽象的概念在不同排行下代表不同含义
* * <p>
* 1. 金额合同金额排行回款金额排行 * 1. 金额合同金额排行回款金额排行
* 2. 个数签约合同排行产品销量排行产品销量排行新增客户数排行新增联系人排行跟进次数排行跟进客户数排行 * 2. 个数签约合同排行产品销量排行产品销量排行新增客户数排行新增联系人排行跟进次数排行跟进客户数排行
*/ */

View File

@ -1,18 +1,18 @@
package cn.iocoder.yudao.module.crm.dal.mysql.statistics; package cn.iocoder.yudao.module.crm.dal.mysql.statistics;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRankReqVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankReqVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
/** /**
* CRM 排行榜统计 Mapper * CRM 数据统计 排行榜统计 Mapper
* *
* @author anhaohao * @author anhaohao
*/ */
@Mapper @Mapper
public interface CrmStatisticsRankingMapper { public interface CrmStatisticsRankMapper {
/** /**
* 查询合同金额排行榜 * 查询合同金额排行榜
@ -20,7 +20,7 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 合同金额排行榜 * @return 合同金额排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectContractPriceRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectContractPriceRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 查询回款金额排行榜 * 查询回款金额排行榜
@ -28,7 +28,7 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 回款金额排行榜 * @return 回款金额排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectReceivablePriceRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectReceivablePriceRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 查询签约合同数量排行榜 * 查询签约合同数量排行榜
@ -36,7 +36,7 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 签约合同数量排行榜 * @return 签约合同数量排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectContractCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectContractCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 查询产品销量排行榜 * 查询产品销量排行榜
@ -44,7 +44,7 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 产品销量排行榜 * @return 产品销量排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectProductSalesRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectProductSalesRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 查询新增客户数排行榜 * 查询新增客户数排行榜
@ -52,7 +52,7 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 新增客户数排行榜 * @return 新增客户数排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectCustomerCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectCustomerCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 查询联系人数量排行榜 * 查询联系人数量排行榜
@ -60,7 +60,7 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 联系人数量排行榜 * @return 联系人数量排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectContactsCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectContactsCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 查询跟进次数排行榜 * 查询跟进次数排行榜
@ -68,7 +68,7 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 跟进次数排行榜 * @return 跟进次数排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectFollowCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectFollowCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 查询跟进客户数排行榜 * 查询跟进客户数排行榜
@ -76,6 +76,6 @@ public interface CrmStatisticsRankingMapper {
* @param rankReqVO 参数 * @param rankReqVO 参数
* @return 跟进客户数排行榜 * @return 跟进客户数排行榜
*/ */
List<CrmStatisticsRanKRespVO> selectFollowCustomerCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> selectFollowCustomerCountRank(CrmStatisticsRankReqVO rankReqVO);
} }

View File

@ -1,17 +1,17 @@
package cn.iocoder.yudao.module.crm.service.statistics; package cn.iocoder.yudao.module.crm.service.statistics;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRankReqVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankReqVO;
import java.util.List; import java.util.List;
/** /**
* CRM 排行榜统计 Service 接口 * CRM 数据统计 排行榜统计 Service 接口
* *
* @author anhaohao * @author anhaohao
*/ */
public interface CrmStatisticsRankingService { public interface CrmStatisticsRankService {
/** /**
* 获得合同金额排行榜 * 获得合同金额排行榜
@ -19,7 +19,7 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 合同金额排行榜 * @return 合同金额排行榜
*/ */
List<CrmStatisticsRanKRespVO> getContractPriceRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getContractPriceRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 获得回款金额排行榜 * 获得回款金额排行榜
@ -27,7 +27,7 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 回款金额排行榜 * @return 回款金额排行榜
*/ */
List<CrmStatisticsRanKRespVO> getReceivablePriceRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getReceivablePriceRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 获得签约合同数量排行榜 * 获得签约合同数量排行榜
@ -35,7 +35,7 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 签约合同数量排行榜 * @return 签约合同数量排行榜
*/ */
List<CrmStatisticsRanKRespVO> getContractCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getContractCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 获得产品销量排行榜 * 获得产品销量排行榜
@ -43,7 +43,7 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 产品销量排行榜 * @return 产品销量排行榜
*/ */
List<CrmStatisticsRanKRespVO> getProductSalesRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getProductSalesRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 获得新增客户数排行榜 * 获得新增客户数排行榜
@ -51,7 +51,7 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 新增客户数排行榜 * @return 新增客户数排行榜
*/ */
List<CrmStatisticsRanKRespVO> getCustomerCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getCustomerCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 获得联系人数量排行榜 * 获得联系人数量排行榜
@ -59,7 +59,7 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 联系人数量排行榜 * @return 联系人数量排行榜
*/ */
List<CrmStatisticsRanKRespVO> getContactsCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getContactsCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 获得跟进次数排行榜 * 获得跟进次数排行榜
@ -67,7 +67,7 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 跟进次数排行榜 * @return 跟进次数排行榜
*/ */
List<CrmStatisticsRanKRespVO> getFollowCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getFollowCountRank(CrmStatisticsRankReqVO rankReqVO);
/** /**
* 获得跟进客户数排行榜 * 获得跟进客户数排行榜
@ -75,6 +75,6 @@ public interface CrmStatisticsRankingService {
* @param rankReqVO 排行参数 * @param rankReqVO 排行参数
* @return 跟进客户数排行榜 * @return 跟进客户数排行榜
*/ */
List<CrmStatisticsRanKRespVO> getFollowCustomerCountRank(CrmStatisticsRankReqVO rankReqVO); List<CrmStatisticsRankRespVO> getFollowCustomerCountRank(CrmStatisticsRankReqVO rankReqVO);
} }

View File

@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.crm.service.statistics;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRankReqVO; import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO;
import cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsRankingMapper; import cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsRankMapper;
import cn.iocoder.yudao.module.system.api.dept.DeptApi; import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@ -23,16 +23,16 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
/** /**
* CRM 排行榜统计 Service 实现类 * CRM 数据统计 排行榜统计 Service 实现类
* *
* @author anhaohao * @author anhaohao
*/ */
@Service @Service
@Validated @Validated
public class CrmStatisticsRankingServiceImpl implements CrmStatisticsRankingService { public class CrmStatisticsRankServiceImpl implements CrmStatisticsRankService {
@Resource @Resource
private CrmStatisticsRankingMapper rankMapper; private CrmStatisticsRankMapper rankMapper;
@Resource @Resource
private AdminUserApi adminUserApi; private AdminUserApi adminUserApi;
@ -40,42 +40,42 @@ public class CrmStatisticsRankingServiceImpl implements CrmStatisticsRankingServ
private DeptApi deptApi; private DeptApi deptApi;
@Override @Override
public List<CrmStatisticsRanKRespVO> getContractPriceRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getContractPriceRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectContractPriceRank); return getRank(rankReqVO, rankMapper::selectContractPriceRank);
} }
@Override @Override
public List<CrmStatisticsRanKRespVO> getReceivablePriceRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getReceivablePriceRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectReceivablePriceRank); return getRank(rankReqVO, rankMapper::selectReceivablePriceRank);
} }
@Override @Override
public List<CrmStatisticsRanKRespVO> getContractCountRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getContractCountRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectContractCountRank); return getRank(rankReqVO, rankMapper::selectContractCountRank);
} }
@Override @Override
public List<CrmStatisticsRanKRespVO> getProductSalesRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getProductSalesRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectProductSalesRank); return getRank(rankReqVO, rankMapper::selectProductSalesRank);
} }
@Override @Override
public List<CrmStatisticsRanKRespVO> getCustomerCountRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getCustomerCountRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectCustomerCountRank); return getRank(rankReqVO, rankMapper::selectCustomerCountRank);
} }
@Override @Override
public List<CrmStatisticsRanKRespVO> getContactsCountRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getContactsCountRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectContactsCountRank); return getRank(rankReqVO, rankMapper::selectContactsCountRank);
} }
@Override @Override
public List<CrmStatisticsRanKRespVO> getFollowCountRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getFollowCountRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectFollowCountRank); return getRank(rankReqVO, rankMapper::selectFollowCountRank);
} }
@Override @Override
public List<CrmStatisticsRanKRespVO> getFollowCustomerCountRank(CrmStatisticsRankReqVO rankReqVO) { public List<CrmStatisticsRankRespVO> getFollowCustomerCountRank(CrmStatisticsRankReqVO rankReqVO) {
return getRank(rankReqVO, rankMapper::selectFollowCustomerCountRank); return getRank(rankReqVO, rankMapper::selectFollowCustomerCountRank);
} }
@ -86,18 +86,18 @@ public class CrmStatisticsRankingServiceImpl implements CrmStatisticsRankingServ
* @param rankFunction 排行榜方法 * @param rankFunction 排行榜方法
* @return 排行版数据 * @return 排行版数据
*/ */
private List<CrmStatisticsRanKRespVO> getRank(CrmStatisticsRankReqVO rankReqVO, Function<CrmStatisticsRankReqVO, List<CrmStatisticsRanKRespVO>> rankFunction) { private List<CrmStatisticsRankRespVO> getRank(CrmStatisticsRankReqVO rankReqVO, Function<CrmStatisticsRankReqVO, List<CrmStatisticsRankRespVO>> rankFunction) {
// 1. 获得用户编号数组 // 1. 获得用户编号数组
rankReqVO.setUserIds(getUserIds(rankReqVO.getDeptId())); rankReqVO.setUserIds(getUserIds(rankReqVO.getDeptId()));
if (CollUtil.isEmpty(rankReqVO.getUserIds())) { if (CollUtil.isEmpty(rankReqVO.getUserIds())) {
return Collections.emptyList(); return Collections.emptyList();
} }
// 2. 获得排行数据 // 2. 获得排行数据
List<CrmStatisticsRanKRespVO> ranks = rankFunction.apply(rankReqVO); List<CrmStatisticsRankRespVO> ranks = rankFunction.apply(rankReqVO);
if (CollUtil.isEmpty(ranks)) { if (CollUtil.isEmpty(ranks)) {
return Collections.emptyList(); return Collections.emptyList();
} }
ranks.sort(Comparator.comparing(CrmStatisticsRanKRespVO::getCount).reversed()); ranks.sort(Comparator.comparing(CrmStatisticsRankRespVO::getCount).reversed());
// 3. 拼接用户信息 // 3. 拼接用户信息
appendUserInfo(ranks); appendUserInfo(ranks);
return ranks; return ranks;
@ -108,8 +108,8 @@ public class CrmStatisticsRankingServiceImpl implements CrmStatisticsRankingServ
* *
* @param ranks 排行榜数据 * @param ranks 排行榜数据
*/ */
private void appendUserInfo(List<CrmStatisticsRanKRespVO> ranks) { private void appendUserInfo(List<CrmStatisticsRankRespVO> ranks) {
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSet(ranks, CrmStatisticsRanKRespVO::getOwnerUserId)); Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSet(ranks, CrmStatisticsRankRespVO::getOwnerUserId));
Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
ranks.forEach(rank -> MapUtils.findAndThen(userMap, rank.getOwnerUserId(), user -> { ranks.forEach(rank -> MapUtils.findAndThen(userMap, rank.getOwnerUserId(), user -> {
rank.setNickname(user.getNickname()); rank.setNickname(user.getNickname());

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsRankingMapper"> <mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.statistics.CrmStatisticsRankMapper">
<select id="selectContractPriceRank" <select id="selectContractPriceRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT IFNULL(SUM(total_price), 0) AS count, owner_user_id SELECT IFNULL(SUM(total_price), 0) AS count, owner_user_id
FROM crm_contract FROM crm_contract
WHERE deleted = 0 WHERE deleted = 0
@ -18,7 +18,7 @@
</select> </select>
<select id="selectReceivablePriceRank" <select id="selectReceivablePriceRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT IFNULL(SUM(price), 0) AS count, owner_user_id SELECT IFNULL(SUM(price), 0) AS count, owner_user_id
FROM crm_receivable FROM crm_receivable
WHERE deleted = 0 WHERE deleted = 0
@ -33,7 +33,7 @@
</select> </select>
<select id="selectContractCountRank" <select id="selectContractCountRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT COUNT(1) AS count, owner_user_id SELECT COUNT(1) AS count, owner_user_id
FROM crm_contract FROM crm_contract
WHERE deleted = 0 WHERE deleted = 0
@ -49,7 +49,7 @@
<!-- TODO 待定 这里是否需要关联 crm_contract_product 表,计算销售额 --> <!-- TODO 待定 这里是否需要关联 crm_contract_product 表,计算销售额 -->
<select id="selectProductSalesRank" <select id="selectProductSalesRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT COUNT(1) AS count, owner_user_id SELECT COUNT(1) AS count, owner_user_id
FROM crm_contract FROM crm_contract
WHERE deleted = 0 WHERE deleted = 0
@ -64,7 +64,7 @@
</select> </select>
<select id="selectCustomerCountRank" <select id="selectCustomerCountRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT COUNT(1) AS count, owner_user_id SELECT COUNT(1) AS count, owner_user_id
FROM crm_customer FROM crm_customer
WHERE deleted = 0 WHERE deleted = 0
@ -78,7 +78,7 @@
</select> </select>
<select id="selectContactsCountRank" <select id="selectContactsCountRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT COUNT(1) AS count, owner_user_id SELECT COUNT(1) AS count, owner_user_id
FROM crm_contact FROM crm_contact
WHERE deleted = 0 WHERE deleted = 0
@ -92,7 +92,7 @@
</select> </select>
<select id="selectFollowCountRank" <select id="selectFollowCountRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT COUNT(1) AS count, cc.owner_user_id SELECT COUNT(1) AS count, cc.owner_user_id
FROM crm_follow_up_record AS cfur FROM crm_follow_up_record AS cfur
LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids) LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
@ -108,7 +108,7 @@
</select> </select>
<select id="selectFollowCustomerCountRank" <select id="selectFollowCustomerCountRank"
resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.CrmStatisticsRanKRespVO"> resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
SELECT COUNT(DISTINCT cc.id) AS count, cc.owner_user_id SELECT COUNT(DISTINCT cc.id) AS count, cc.owner_user_id
FROM crm_follow_up_record AS cfur FROM crm_follow_up_record AS cfur
LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids) LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)