傅行帆 il y a 5 ans
Parent
révision
d4ffb6c83f

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaChannelController.java Voir le fichier

@@ -269,7 +269,7 @@ public class TaChannelController extends BaseController {
269 269
                                                      @RequestParam(value = "sortField", required = false) String sortField,
270 270
                                                      @RequestParam(value = "sortOrder", required = false) String sortOrder,
271 271
                                                      HttpServletRequest request) {
272
-        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder);
272
+        return taChannelService.getChannelIntroductionList(pageNum, pageSize, getOrgId(request), startDate, endDate, targetType, buildingId, channelId,sortField,sortOrder, getTaPersonBuildingListByUserId(request));
273 273
     }
274 274
 
275 275
     /**

+ 2
- 1
src/main/java/com/huiju/estateagents/mapper/TaChannelMapper.java Voir le fichier

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5
 import com.huiju.estateagents.entity.TaChannel;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import com.huiju.estateagents.entity.TsActivityDaily;
7 8
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
8 9
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
@@ -56,7 +57,7 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
56 57
      * @param buildingId
57 58
      * @return
58 59
      */
59
-    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);
60
+    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);
60 61
 
61 62
     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);
62 63
 

+ 2
- 1
src/main/java/com/huiju/estateagents/service/TaChannelService.java Voir le fichier

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.entity.TaChannel;
6
+import com.huiju.estateagents.entity.TaPersonBuilding;
6 7
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
7 8
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
8 9
 import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
@@ -32,7 +33,7 @@ public interface TaChannelService extends IService<TaChannel> {
32 33
      * @param buildingId
33 34
      * @return
34 35
      */
35
-    ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder);
36
+    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);
36 37
 
37 38
     /**
38 39
      * 获取注册用户列表

+ 7
- 3
src/main/java/com/huiju/estateagents/service/impl/TaChannelServiceImpl.java Voir le fichier

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 6
 import com.huiju.estateagents.base.ResponseBean;
7 7
 import com.huiju.estateagents.common.StringUtils;
8 8
 import com.huiju.estateagents.entity.TaChannel;
9
+import com.huiju.estateagents.entity.TaPersonBuilding;
9 10
 import com.huiju.estateagents.entity.TsActivityDaily;
10
-import com.huiju.estateagents.excel.ActivityStatistics.*;
11
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum;
12
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitNum;
13
+import com.huiju.estateagents.excel.ActivityStatistics.ChannelVisitPersonNum;
14
+import com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily;
11 15
 import com.huiju.estateagents.mapper.TaChannelMapper;
12 16
 import com.huiju.estateagents.service.TaChannelService;
13 17
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +47,7 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
43 47
      * @return
44 48
      */
45 49
     @Override
46
-    public ResponseBean getChannelIntroductionList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId,String sortField,String sortOrder) {
50
+    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) {
47 51
         IPage<TsActivityDaily> pg = new Page<>(pageNum, pageSize);
48 52
         String orderType = "asc";
49 53
         if ("descend".equals(sortOrder)){
@@ -55,7 +59,7 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
55 59
             sortField = "new_customers";
56 60
             orderType = "desc";
57 61
         }
58
-        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType);
62
+        IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType,taPersonBuildings);
59 63
         return ResponseBean.success(data);
60 64
     }
61 65
 

+ 6
- 0
src/main/resources/mapper/TaChannelMapper.xml Voir le fichier

@@ -100,6 +100,12 @@
100 100
         <if test="buildingId != null and buildingId != ''">
101 101
             and building_id = #{buildingId}
102 102
         </if>
103
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
104
+            and building_id in
105
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
106
+                #{taPersonBuilding.buildingId}
107
+            </foreach>
108
+        </if>
103 109
         GROUP BY   target_id, target_type
104 110
         <if test="sortField != null and sortField != ''">
105 111
             ORDER BY ${sortField} ${orderType}