修改：CRM 商业智能，合并模块到 crm，优化查询
安浩浩
2 years ago
parent
acb8d3f23b
commit
46e01e07a8
@ -1 +0,0 @@
|
||||
package cn.iocoder.yudao.module.bi.api;
|
||||
@ -1 +0,0 @@
|
||||
package cn.iocoder.yudao.module.bi.enums;
|
||||
@ -1,31 +0,0 @@
|
||||
package cn.iocoder.yudao.module.bi.dal.mysql;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.bi.controller.admin.ranking.vo.BiContractRanKingRespVO;
|
||||
import cn.iocoder.yudao.module.bi.controller.admin.ranking.vo.BiReceivablesRanKingRespVO;
|
||||
import cn.iocoder.yudao.module.bi.util.BiTimeUtil;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author anhaohao
|
||||
*/
|
||||
@Mapper
|
||||
public interface BiRankingMapper extends BaseMapperX {
|
||||
/**
|
||||
* 合同金额排行榜
|
||||
*
|
||||
* @param biTimeEntity 参数
|
||||
* @return List<BiContractAmountRankingRespVO>
|
||||
*/
|
||||
List<BiContractRanKingRespVO> contractRanKing(BiTimeUtil.BiTimeEntity biTimeEntity);
|
||||
|
||||
/**
|
||||
* 回款金额排行榜
|
||||
*
|
||||
* @param biTimeEntity 参数
|
||||
* @return List<BiContractAmountRankingRespVO>
|
||||
*/
|
||||
List<BiReceivablesRanKingRespVO> receivablesRanKing(BiTimeUtil.BiTimeEntity biTimeEntity);
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
/**
|
||||
* 属于 bi 模块的 framework 封装
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
package cn.iocoder.yudao.module.bi.framework;
|
||||
@ -1,24 +0,0 @@
|
||||
package cn.iocoder.yudao.module.bi.framework.web.config;
|
||||
|
||||
import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration;
|
||||
import org.springdoc.core.models.GroupedOpenApi;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* bi 模块的 web 组件的 Configuration
|
||||
*
|
||||
* @author 芋道源码
|
||||
*/
|
||||
@Configuration(proxyBeanMethods = false)
|
||||
public class BiWebConfiguration {
|
||||
|
||||
/**
|
||||
* bi 模块的 API 分组
|
||||
*/
|
||||
@Bean
|
||||
public GroupedOpenApi biGroupedOpenApi() {
|
||||
return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("bi");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,4 +0,0 @@
|
||||
/**
|
||||
* bi 模块的 web 配置
|
||||
*/
|
||||
package cn.iocoder.yudao.module.bi.framework.web;
|
||||
@ -1,53 +0,0 @@
|
||||
package cn.iocoder.yudao.module.bi.service.ranking;
|
||||
|
||||
import cn.iocoder.yudao.module.bi.controller.admin.ranking.vo.BiContractRanKingRespVO;
|
||||
import cn.iocoder.yudao.module.bi.controller.admin.ranking.vo.BiParams;
|
||||
import cn.iocoder.yudao.module.bi.controller.admin.ranking.vo.BiRankReqVO;
|
||||
import cn.iocoder.yudao.module.bi.controller.admin.ranking.vo.BiReceivablesRanKingRespVO;
|
||||
import cn.iocoder.yudao.module.bi.dal.mysql.BiRankingMapper;
|
||||
import cn.iocoder.yudao.module.bi.util.BiTimeUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author anhaohao
|
||||
*/
|
||||
@Service(value = "biRankService")
|
||||
@Validated
|
||||
public class BiRankingServiceImpl implements BiRankingService {
|
||||
|
||||
@Resource
|
||||
private BiRankingMapper biRankingMapper;
|
||||
|
||||
@Override
|
||||
public List<BiContractRanKingRespVO> contractRanKing(BiRankReqVO biRankReqVO) {
|
||||
BiParams biParams = new BiParams();
|
||||
biParams.setType(biRankReqVO.getType());
|
||||
biParams.setDeptId(biRankReqVO.getDeptId());
|
||||
biParams.setIsUser(0);
|
||||
BiTimeUtil.BiTimeEntity biTimeEntity = BiTimeUtil.analyzeType(biParams);
|
||||
List<Long> userIds = biTimeEntity.getUserIds();
|
||||
if (userIds.isEmpty()) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return biRankingMapper.contractRanKing(biTimeEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BiReceivablesRanKingRespVO> receivablesRanKing(BiRankReqVO biRankReqVO) {
|
||||
BiParams biParams = new BiParams();
|
||||
biParams.setType(biRankReqVO.getType());
|
||||
biParams.setDeptId(biRankReqVO.getDeptId());
|
||||
biParams.setIsUser(0);
|
||||
BiTimeUtil.BiTimeEntity biTimeEntity = BiTimeUtil.analyzeType(biParams);
|
||||
List<Long> userIds = biTimeEntity.getUserIds();
|
||||
if (userIds.isEmpty()) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
return biRankingMapper.receivablesRanKing(biTimeEntity);
|
||||
}
|
||||
}
|
||||
@ -1,9 +1,9 @@
|
||||
### 合同金额排行榜
|
||||
GET {{baseUrl}}/bi/rank/contract-ranKing
|
||||
GET {{baseUrl}}/crm/bi-ranking/contract-ranKing
|
||||
Authorization: Bearer {{token}}
|
||||
tenant-id: {{adminTenentId}}
|
||||
|
||||
### 回款金额排行榜
|
||||
GET {{baseUrl}}/bi/rank/receivables-ranKing
|
||||
GET {{baseUrl}}/crm/bi-ranking/receivables-ranKing
|
||||
Authorization: Bearer {{token}}
|
||||
tenant-id: {{adminTenentId}}
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.iocoder.yudao.module.crm.controller.admin.bi.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@Schema(description = "管理后台 - BI 排行榜 Response VO")
|
||||
@Data
|
||||
public class BiRanKingRespVO {
|
||||
|
||||
@Schema(description = "金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private Integer price;
|
||||
|
||||
@Schema(description = "姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private String nickname;
|
||||
|
||||
@Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "负责人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private Long ownerUserId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.iocoder.yudao.module.crm.controller.admin.bi.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
|
||||
/**
|
||||
* 管理后台 - 排行榜 Request VO
|
||||
*
|
||||
* @author anhaohao
|
||||
*/
|
||||
@Schema(description = "管理后台 - 排行榜 Request VO")
|
||||
@Data
|
||||
public class BiRankingReqVO {
|
||||
|
||||
@Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||
private Long deptId;
|
||||
|
||||
@Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2023-12-12 00:00:00")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2023-12-12 23:59:59")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Schema(description = "负责人用户 id 集合", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "1")
|
||||
private List<Long> userIds;
|
||||
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.iocoder.yudao.module.crm.dal.mysql.bi;
|
||||
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRanKingRespVO;
|
||||
import cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRankingReqVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author anhaohao
|
||||
*/
|
||||
@Mapper
|
||||
public interface BiRankingMapper extends BaseMapperX {
|
||||
/**
|
||||
* 合同金额排行榜
|
||||
*
|
||||
* @param biRankingReqVO 参数
|
||||
* @return List<BiContractAmountRankingRespVO>
|
||||
*/
|
||||
List<BiRanKingRespVO> contractRanKing(BiRankingReqVO biRankingReqVO);
|
||||
|
||||
|
||||
/**
|
||||
* 回款金额排行榜
|
||||
*
|
||||
* @param biRankingReqVO 参数
|
||||
* @return List<BiContractAmountRankingRespVO>
|
||||
*/
|
||||
List<BiRanKingRespVO> receivablesRanKing(BiRankingReqVO biRankingReqVO);
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.iocoder.yudao.module.crm.service.bi;
|
||||
|
||||
|
||||
import cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRanKingRespVO;
|
||||
import cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRankingReqVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* BI 排行榜 Service 接口
|
||||
*
|
||||
* @author anhaohao
|
||||
*/
|
||||
public interface BiRankingService {
|
||||
|
||||
/**
|
||||
* 合同金额排行榜
|
||||
*
|
||||
* @param biRankingReqVO 参数
|
||||
* @return List<BiContractAmountRankingRespVO>
|
||||
*/
|
||||
List<BiRanKingRespVO> contractRanKing(BiRankingReqVO biRankingReqVO);
|
||||
|
||||
/**
|
||||
* 回款金额排行榜
|
||||
*
|
||||
* @param biRankingReqVO 参数
|
||||
* @return List<BiContractAmountRankingRespVO>
|
||||
*/
|
||||
List<BiRanKingRespVO> receivablesRanKing(BiRankingReqVO biRankingReqVO);
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
package cn.iocoder.yudao.module.crm.service.bi;
|
||||
|
||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||
|
||||
import cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRanKingRespVO;
|
||||
import cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRankingReqVO;
|
||||
import cn.iocoder.yudao.module.crm.dal.mysql.bi.BiRankingMapper;
|
||||
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.user.AdminUserApi;
|
||||
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service(value = "biRankingService")
|
||||
@Validated
|
||||
public class BiRankingServiceImpl implements BiRankingService {
|
||||
|
||||
@Resource
|
||||
private BiRankingMapper biRankingMapper;
|
||||
@Resource
|
||||
private AdminUserApi adminUserApi;
|
||||
@Resource
|
||||
private DeptApi deptApi;
|
||||
|
||||
@Override
|
||||
public List<BiRanKingRespVO> contractRanKing(BiRankingReqVO biRankingReqVO) {
|
||||
return processRanking(biRankingReqVO, biRankingMapper::contractRanKing);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BiRanKingRespVO> receivablesRanKing(BiRankingReqVO biRankingReqVO) {
|
||||
return processRanking(biRankingReqVO, biRankingMapper::receivablesRanKing);
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理排行榜
|
||||
*
|
||||
* @param biRankingReqVO 参数
|
||||
* @param rankingFunction 排行榜方法
|
||||
* @return List<BiRanKingRespVO>
|
||||
*/
|
||||
private List<BiRanKingRespVO> processRanking(BiRankingReqVO biRankingReqVO, Function<BiRankingReqVO, List<BiRanKingRespVO>> rankingFunction) {
|
||||
analyzeAuth(biRankingReqVO);
|
||||
if (biRankingReqVO.getUserIds().isEmpty()) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
List<BiRanKingRespVO> biRanKingRespVOS = rankingFunction.apply(biRankingReqVO);
|
||||
return setName(biRanKingRespVOS);
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置用户名称
|
||||
*
|
||||
* @param biRanKingRespVOS 排行榜数据
|
||||
* @return List<BiRanKingRespVO>
|
||||
*/
|
||||
private List<BiRanKingRespVO> setName(List<BiRanKingRespVO> biRanKingRespVOS) {
|
||||
List<Long> userIds = biRanKingRespVOS.stream().map(BiRanKingRespVO::getOwnerUserId).collect(Collectors.toList());
|
||||
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
|
||||
Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(userMap.values().stream().map(AdminUserRespDTO::getDeptId).collect(Collectors.toList()));
|
||||
for (BiRanKingRespVO biRanKingRespVO : biRanKingRespVOS) {
|
||||
AdminUserRespDTO adminUserRespDTO = userMap.get(biRanKingRespVO.getOwnerUserId());
|
||||
if (adminUserRespDTO != null) {
|
||||
biRanKingRespVO.setNickname(adminUserRespDTO.getNickname());
|
||||
DeptRespDTO deptRespDTO = deptMap.get(adminUserRespDTO.getDeptId());
|
||||
if (deptRespDTO != null) {
|
||||
biRanKingRespVO.setDeptName(deptRespDTO.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
return biRanKingRespVOS;
|
||||
}
|
||||
|
||||
/**
|
||||
* 分析权限
|
||||
*
|
||||
* @param biRankingReqVO 参数
|
||||
*/
|
||||
public void analyzeAuth(BiRankingReqVO biRankingReqVO) {
|
||||
Long deptId = biRankingReqVO.getDeptId() == null ? adminUserApi.getUser(SecurityFrameworkUtils.getLoginUserId()).getDeptId() : biRankingReqVO.getDeptId();
|
||||
List<Long> deptIds = deptApi.getChildDeptList(deptId).stream().map(DeptRespDTO::getId).collect(Collectors.toList());
|
||||
deptIds.add(deptId);
|
||||
biRankingReqVO.setUserIds(adminUserApi.getUserListByDeptIds(deptIds).stream().map(AdminUserRespDTO::getId).collect(Collectors.toList()));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
<?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">
|
||||
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.bi.BiRankingMapper">
|
||||
|
||||
|
||||
<select id="contractRanKing"
|
||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRanKingRespVO">
|
||||
SELECT IFNULL(SUM(t.price), 0) AS price, t.owner_user_id
|
||||
FROM crm_contract t
|
||||
WHERE t.deleted = 0
|
||||
AND t.audit_status = 20
|
||||
and t.owner_user_id in
|
||||
<foreach collection="userIds" item="item" open="(" close=")" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND t.order_date between #{startTime} and #{endTime}
|
||||
GROUP BY t.owner_user_id
|
||||
ORDER BY price DESC
|
||||
</select>
|
||||
|
||||
<select id="receivablesRanKing"
|
||||
resultType="cn.iocoder.yudao.module.crm.controller.admin.bi.vo.BiRanKingRespVO">
|
||||
SELECT IFNULL(SUM(t.price), 0) AS price, t.owner_user_id
|
||||
FROM crm_receivable t
|
||||
WHERE t.deleted = 0
|
||||
AND t.audit_status = 20
|
||||
and t.owner_user_id in
|
||||
<foreach collection="userIds" item="item" open="(" close=")" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
AND t.return_time between #{startTime} and #{endTime}
|
||||
GROUP BY t.owner_user_id
|
||||
ORDER BY price DESC
|
||||
</select>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue