|
@@ -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
|
|