新需求

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

@@ -262,4 +262,20 @@ public class TaChannelController extends BaseController {
                                                      HttpServletRequest request) {
         return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, channelType, buildingId, channelId);
     }
+
+    /**
+     * 注册人数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introduction/newuserList")
+    public ResponseBean getNewuserList(@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,
+                                       @RequestParam(value = "statisticType", required = false) String statisticType,
+                                       HttpServletRequest request) {
+        return taChannelService.getNewuserList(pageNum, pageSize, getOrgId(request), channelId, targetId, targetType, buildingId,statisticType);
+    }
 }

src/main/java/com/huiju/estateagents/entity/TsActivityDaily.java

@@ -1,12 +1,14 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 活动统计 
@@ -93,5 +95,14 @@ public class TsActivityDaily implements Serializable {
      */
     private Integer newCustomers;
 
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
 
+    /**
+     * 统计类型
+     */
+    @TableField(exist = false)
+    private String statisticType;
 }

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

@@ -0,0 +1,45 @@
+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 ChannelAddRegistNum {
+    /**
+     * 姓名
+     */
+    @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 createDate;
+
+
+}

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

@@ -4,6 +4,7 @@ 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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -53,4 +54,6 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @return
      */
     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);
 }

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

@@ -27,4 +27,18 @@ public interface TaChannelService extends IService<TaChannel> {
      * @return
      */
     ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId);
+
+    /**
+     * 获取注册用户列表
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @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);
 }

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

@@ -6,6 +6,7 @@ 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.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.TaChannelService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,4 +46,24 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
         IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId);
         return ResponseBean.success(data);
     }
+
+    /**
+     * 获取注册用户列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param channelId
+     * @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);
+        return ResponseBean.success(data);
+    }
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -39,9 +39,8 @@
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
         LEFT JOIN ta_person tp ON cp.person_id = tp.person_id 	AND tp.person_type = 'estate agent' 	AND cp.STATUS = 1
-        LEFT JOIN (SELECT sum(z.customerNum) as customerNum,z.qr_code_id,z.org_id,z.channel_id from (SELECT sum(new_customers) as customerNum,qr_code_id,channel_id,org_id from ts_activity_daily where channel_id is not null and org_id = #{orgId} GROUP BY channel_id
-        union all
-        SELECT sum(new_customers) as customerNum,qr_code_id,channel_id,org_id from ts_channel_daily where channel_id is not null and org_id = #{orgId} GROUP BY channel_id) z GROUP BY z.channel_id) ts on c.channel_id = ts.channel_id
+        LEFT JOIN (
+        SELECT sum(new_customers) as customerNum,qr_code_id,channel_id,org_id from ts_channel_daily where channel_id is not null and org_id = #{orgId} GROUP BY channel_id) ts on c.channel_id = ts.channel_id
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}
@@ -73,18 +72,51 @@
         SELECT
             *
         FROM
-            ts_activity_daily
+            ts_channel_daily
         WHERE
             channel_id = #{channelId}
         AND org_id = #{orgId}
-        UNION ALL
+        <if test="startDate != null and endDate != null">
+            AND statis_date BETWEEN #{startDate} AND #{endDate}
+        </if>
+        <if test="channelType != null and channelType != ''">
+            and target_type = #{channelType}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+    </select>
+    <select id="getActivityNewuserList"
+            resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">
         SELECT
-            *
-        FROM
-            ts_channel_daily
-        WHERE
-            channel_id = #{channelId}
-            AND org_id = #{orgId}
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        t.create_date
+        FROM ta_customer_from 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 and c.realty_consultant is not null-->
+<!--        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-->
+        WHERE t.org_id = #{orgId}
+        and t.is_org_first = 1
+<!--        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},-->
+<!--        '%Y-%m-%d' )-->
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = #{activityType}
+        </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 order by t.create_date desc
     </select>
 
 </mapper>