新需求

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

 package com.huiju.estateagents.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import io.swagger.annotations.ApiOperation;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaBuildingReport;
 import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.TaChannelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
-import org.apache.http.HttpRequest;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 /**
         ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
         return taPerson;
     }
+
+    /**
+     * 渠道引进客户统计
+     * @return
+     */
+    @GetMapping(value = "/admin/channel/introductionList")
+    public ResponseBean getChannelIntroductionList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                                     @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                                     @RequestParam(value = "channelType", required = false)String channelType,
+                                                     @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                     @RequestParam(value = "channelId") Integer channelId,
+                                                     HttpServletRequest request) {
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, channelType, buildingId, channelId);
+    }
 }

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

 package com.huiju.estateagents.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *  
     @TableField(exist = false)
     private Integer inviteCount;
 
+    @TableField(exist = false)
+    private Integer customerNum;
+
     /**
      * 创建时间
      */

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

 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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
     IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
 
     List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
+
+    /**
+     * 渠道引进客户统计
+     * @param pg
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @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);
 }

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

 package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChannel;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  *   服务类
  */
 public interface TaChannelService extends IService<TaChannel> {
 
+    /**
+     * 渠道引进客户统计
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @return
+     */
+    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId);
 }

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

 package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.TaChannelService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  *   服务实现类
 @Service
 public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel> implements TaChannelService {
 
+    @Autowired
+    private TaChannelMapper taChannelMapper;
+
+    /**
+     * 渠道引进客户统计
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param channelType
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId) {
+        IPage<TsActivityDaily> pg = new Page<>(pageNum, pageSize);
+        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId);
+        return ResponseBean.success(data);
+    }
 }

src/main/resources/mapper/TaChannelMapper.xml

         c.*,
         count(tp.person_id) AS brokerCount,
         (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
+        IFNULL(ts.customerNum,0) as customerNum,
         cp.person_id
         FROM
         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
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}
         GROUP BY c.channel_id
     </select>
 
+    <select id="getChannelIntroductionList" resultType="com.huiju.estateagents.entity.TsActivityDaily">
+        SELECT
+            *
+        FROM
+            ts_activity_daily
+        WHERE
+            channel_id = #{channelId}
+        AND org_id = #{orgId}
+        UNION ALL
+        SELECT
+            *
+        FROM
+            ts_channel_daily
+        WHERE
+            channel_id = #{channelId}
+            AND org_id = #{orgId}
+    </select>
+
 </mapper>