新需求

src/main/java/com/huiju/estateagents/controller/TaChannelController.java

@@ -264,7 +264,7 @@ public class TaChannelController extends BaseController {
     }
 
     /**
-     * 注册人数统计
+     * 渠道注册用户列表
      * @return
      */
     @GetMapping(value = "/admin/channel/introduction/newuserList")
@@ -274,8 +274,38 @@ public class TaChannelController extends BaseController {
                                        @RequestParam(value = "targetType", required = false) String targetType,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        @RequestParam(value = "channelId", required = false) Integer channelId,
-                                       @RequestParam(value = "statisticType", required = false) String statisticType,
                                        HttpServletRequest request) {
-        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,statisticType);
+        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+    }
+
+    /**
+     * 渠道访问次数列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/visitNumList")
+    public ResponseBean getVisitNumList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                       @RequestParam(value = "targetId", required = false) String targetId,
+                                       @RequestParam(value = "targetType", required = false) String targetType,
+                                       @RequestParam(value = "buildingId", required = false) String buildingId,
+                                       @RequestParam(value = "channelId", required = false) Integer channelId,
+                                       HttpServletRequest request) {
+        return taChannelService.getVisitNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
+    }
+
+
+    /**
+     * 渠道访问人数列表
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/personNumList")
+    public ResponseBean getPersonNumList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                        @RequestParam(value = "targetId", required = false) String targetId,
+                                        @RequestParam(value = "targetType", required = false) String targetType,
+                                        @RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "channelId", required = false) Integer channelId,
+                                        HttpServletRequest request) {
+        return taChannelService.getPersonNumList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId);
     }
 }

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitNum.java

@@ -0,0 +1,79 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelVisitNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 来源渠道
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来源渠道", index = 4)
+    private String personFrom;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 5)
+    private String realtyConsultant;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 6)
+    private String realtyConsultantPhone;
+
+    /**
+     * 分享者
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者", index = 7)
+    private String sharePersonName;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者电话", index = 8)
+    private String sharePersonPhone;
+
+    /**
+     * 访问时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 9)
+    private String visitDate;
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ChannelVisitPersonNum.java

@@ -0,0 +1,86 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ChannelVisitPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 来源渠道
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来源渠道", index = 4)
+    private String personFrom;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 5)
+    private String realtyConsultant;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 6)
+    private String realtyConsultantPhone;
+
+    /**
+     * 推广人
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人", index = 7)
+    private String sharePersonName;
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 8)
+    private String visitNum;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TsActivityDaily;
-import com.huiju.estateagents.excel.ActivityStatistics.AddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,5 +57,9 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      */
     IPage<TsActivityDaily> getChannelIntroductionList(IPage<TsActivityDaily> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId);
 
-    IPage<AddRegistNum> getActivityNewuserList(IPage<AddRegistNum> iPage,@Param("orgId") Integer orgId, @Param("channelId") Integer channelId,@Param("activityId") String activityId,@Param("activityType") String activityType,@Param("buildingId") String buildingId);
+    IPage<ChannelAddRegistNum> getChannelNewuserList(IPage<ChannelAddRegistNum> iPage, @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId);
+
+    IPage<ChannelVisitNum> getChannelVisitNumList(IPage<ChannelVisitNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
+
+    IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/service/TaChannelService.java

@@ -37,8 +37,33 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param targetId
      * @param targetType
      * @param buildingId
-     * @param statisticType
      * @return
      */
-    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, String statisticType);
+    ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+
+    /**
+     * 获取渠道下的访问次数列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
+
+    /**
+     * 获取渠道下的访问人数列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaChannelServiceImpl.java

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TsActivityDaily;
-import com.huiju.estateagents.excel.ActivityStatistics.AddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
+import com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.TaChannelService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,13 +60,50 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @param targetId
      * @param targetType
      * @param buildingId
-     * @param statisticType
      * @return
      */
     @Override
-    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId, String statisticType) {
-        IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<AddRegistNum> data = taChannelMapper.getActivityNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId);
+    public ResponseBean getNewuserList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+        IPage<ChannelAddRegistNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<ChannelAddRegistNum> data = taChannelMapper.getChannelNewuserList(iPage, orgId, channelId, targetId,targetType, buildingId);
+        return ResponseBean.success(data);
+    }
+
+    /**
+     * 获取渠道下的访问次数列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getVisitNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+        IPage<ChannelVisitNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<ChannelVisitNum> data = taChannelMapper.getChannelVisitNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
+        return ResponseBean.success(data);
+    }
+
+    /**
+     * 获取渠道下的访问人数列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @param targetId
+     * @param targetType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getPersonNumList(Integer pageNum, Integer pageSize, Integer orgId, Integer channelId, String targetId, String targetType, String buildingId) {
+        IPage<ChannelVisitPersonNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<ChannelVisitPersonNum> data = taChannelMapper.getChannelPersonNumList(iPage, orgId, channelId, targetId, targetType, buildingId);
         return ResponseBean.success(data);
     }
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -86,7 +86,7 @@
             and building_id = #{buildingId}
         </if>
     </select>
-    <select id="getActivityNewuserList"
+    <select id="getChannelNewuserList"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">
         SELECT
         a.nickname, a.phone,
@@ -118,5 +118,109 @@
         </if>
         group by t.person_id order by t.create_date desc
     </select>
+    <select id="getChannelVisitNumList" resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        e.nickname as sharePersonName,
+        e.phone as sharePersonPhone,
+        t.visit_time as visitDate
+        From (
+        SELECT
+        t.person_id, t.visit_time, t.share_person_id
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` = 'detail'
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5'
+        )
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
+            end)
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        AND t.org_id = #{orgId}
+<!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
+<!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
+        ) t
+        left join ta_person a on t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        left join ta_person e on t.share_person_id = e.person_id
+        group by t.visit_time
+        order by t.visit_time desc
+    </select>
+    <select id="getChannelPersonNumList"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_alias as personFrom,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
+        t.create_date as visitDate,
+        e.nickName as sharePersonName,
+        t.visitNum
+        from (
+        SELECT
+        t.visit_time AS create_date,
+        t.person_id,
+        count(*) as visitNum
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` = 'detail'
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5'
+        )
+        AND t.org_id = #{orgId}
+<!--        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')-->
+<!--        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')-->
+        <if test="targetId != null and targetId != ''">
+            and t.target_id = #{targetId}
+        </if>
+        <if test="targetType != null and targetType != ''">
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
+            end)
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and t.building_id = #{buildingId}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and t.channel_id = #{channelId}
+        </if>
+        GROUP BY
+        t.person_id ) as t
+        left join ta_person a on t.person_id = a.person_id
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time = 1
+        left join td_wx_dict b1 on b.scene_id = b1.scene_id
+        LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
+        group by t.person_id
+        order by t.create_date desc
+    </select>
 
 </mapper>