diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index f43c5510..d9149ff3 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -756,6 +756,17 @@ public class PartnerOwnController extends BaseController { return success(partnerList.staticsTable3(partners.getPartnerId(), startTime, endTime)); } + /** + * 客户来源统计 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return + */ + @GetMapping("/customerSourceCount") + public CommonResult customerSourceCount(String startTime, String endTime, Long businessId) { + return success(partnerList.customerSourceCount(startTime, endTime, businessId)); + } + //新统计表格3 @GetMapping("/newStaticsTable3") public CommonResult newStaticsTable3(String startTime, String endTime) throws Exception { diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java index 9c4063c1..68d135e1 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java @@ -135,4 +135,14 @@ public interface AppInspectionPartnerMapper extends BaseMapper * @param endTime 结束时间 */ List> queryInspectionSkuList(@Param("startTime") String startTime, @Param("endTime") String endTime); + + /** + * 获取业务统计 + * @param startTime + * @param endTime + * @return + */ + List> selectBusinessStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime); + + List> customerSourceCount(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("businessId") Long businessId); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java index d74c0ddb..0fdfa839 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java @@ -251,5 +251,15 @@ public interface AppInspectionPartnerService extends IService * @param endTime 结束时间 * @return 结果 */ - Map fileStatistics(String servicePackageId,String startTime, String endTime); + Map fileStatistics(String servicePackageId, String startTime, String endTime); + + /** + * 客户来源统计 + * + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param businessId 业务渠道id + * @return + */ + List> customerSourceCount(String startTime, String endTime, Long businessId); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index 2283b144..21af7b52 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspection.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -1589,11 +1590,14 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl> res = baseMapper.staticsTable3(partnerId, startTime, endTime); +// List> res = baseMapper.staticsTable3(partnerId, startTime, endTime); + List> res = baseMapper.selectBusinessStatistics( startTime, endTime); return res; } @@ -2343,4 +2348,26 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl> customerSourceCount(String startTime, String endTime, Long businessId) { + // 判断开始时间与结束时间如果为空 默认查询本月 + if (StringUtils.isNotEmpty(startTime)) { + startTime = startTime + " 00:00:00"; + } + if (StringUtils.isNotEmpty(endTime)) { + endTime = endTime + " 23:59:59"; + } + List> maps = baseMapper.customerSourceCount(startTime, endTime, businessId); + // 根据map中的theNum从大到小排序 + maps.sort(Comparator.comparingInt(map -> -Integer.parseInt(map.get("theNum").toString()))); + return maps; + } } diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml index 9f0c40b6..cf178e22 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml @@ -815,4 +815,54 @@ FROM GROUP BY s.sku_name + + +