Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

                                                      @RequestParam(value = "sortField", required = false) String sortField,
                                                      @RequestParam(value = "sortOrder", required = false) String sortOrder,
                                                      HttpServletRequest request) {
-        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder);
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder, getTaPersonBuildingListByUserId(request));
     }
 
     /**

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.TaPersonBuilding;
 import com.huiju.estateagents.entity.TsActivityDaily;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
      * @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,@Param("sortField") String sortField,@Param("orderType") String orderType);
+    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, @Param("sortField") String sortField, @Param("orderType") String orderType, @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
 
     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,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 

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

 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
      * @param buildingId
      * @return
      */
-    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder);
+    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder, List<TaPersonBuilding> taPersonBuildings);
 
     /**
      * 获取注册用户列表

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

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TsActivityDaily;
-import com.huiju.estateagents.excel.ActivityStatistics.*;
+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.TsChannelDaily;
 import com.huiju.estateagents.mapper.TaChannelMapper;
 import com.huiju.estateagents.service.TaChannelService;
 import org.springframework.beans.factory.annotation.Autowired;
      * @return
      */
     @Override
-    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder) {
+    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder, List<TaPersonBuilding> taPersonBuildings) {
         IPage<TsActivityDaily> pg = new Page<>(pageNum, pageSize);
         String orderType = "asc";
         if ("descend".equals(sortOrder)){
             sortField = "new_customers";
             orderType = "desc";
         }
-        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType);
+        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType,taPersonBuildings);
         return ResponseBean.success(data);
     }
 

src/main/resources/mapper/TaChannelMapper.xml

         <if test="buildingId != null and buildingId != ''">
             and building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY   target_id, target_type
         <if test="sortField != null and sortField != ''">
             ORDER BY ${sortField} ${orderType}