|
@@ -61,7 +61,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
|
61
|
61
|
Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
|
62
|
62
|
|
63
|
63
|
// 用户行为
|
64
|
|
- List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null, null);
|
|
64
|
+ List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null, null, null, null, null);
|
65
|
65
|
|
66
|
66
|
// 用户活跃数
|
67
|
67
|
List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
|
|
@@ -163,14 +163,21 @@ public class StatisticalServiceImpl implements IStatisticalService {
|
163
|
163
|
}
|
164
|
164
|
|
165
|
165
|
@Override
|
166
|
|
- public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, LocalDate startDate, LocalDate endDate, String buildingId) {
|
|
166
|
+ public ResponseBean selectUserBehavior(Integer pageNum,
|
|
167
|
+ Integer pageSize,
|
|
168
|
+ LocalDate startDate,
|
|
169
|
+ LocalDate endDate,
|
|
170
|
+ String buildingId,
|
|
171
|
+ String eventType,
|
|
172
|
+ String event,
|
|
173
|
+ String activity) {
|
167
|
174
|
ResponseBean responseBean = new ResponseBean();
|
168
|
175
|
|
169
|
176
|
// 用户行为
|
170
|
|
- List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId);
|
|
177
|
+ List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId, eventType, event, activity);
|
171
|
178
|
|
172
|
179
|
IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
|
173
|
|
- IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, buildingId);
|
|
180
|
+ IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, buildingId, eventType, event, activity);
|
174
|
181
|
|
175
|
182
|
Map<String, Object> map = new HashMap<>();
|
176
|
183
|
map.put("selectUserBehavior", selectUserBehavior);
|