Commit 96cda525 by “Kongxiangkun”

工作台面板问题修复

parent 85b4033f
...@@ -30,7 +30,7 @@ public interface EventTrackMapper extends BaseMapper<EventTrack> { ...@@ -30,7 +30,7 @@ public interface EventTrackMapper extends BaseMapper<EventTrack> {
List<EventTrackTypeNumVo> queryNumByType(@Param("deptId") Long deptId,@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("subNameList")List<Long> subNameList,@Param("siteId") Long siteId, List<EventTrackTypeNumVo> queryNumByType(@Param("deptId") Long deptId,@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("subNameList")List<Long> subNameList,@Param("siteId") Long siteId,
@Param("isPre") Boolean isPre); @Param("isPre") Boolean isPre);
List<EventTrackTypeNumVo> queryNumByTypeInformation(@Param("deptId") Long deptId,@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("subNameList")List<String> subNameList,@Param("siteId") Long siteId, List<EventTrackTypeNumVo> queryNumByTypeInformation(@Param("deptId") Long deptId,@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("subNameList")List<Long> subNameList,@Param("siteId") Long siteId,
@Param("isPre") Boolean isPre); @Param("isPre") Boolean isPre);
List<EventTrackTypeNumVo> queryTgNumByDept(@Param("deptName") String deptName,@Param("typeId")Long typeId,@Param("siteId") Long siteId); List<EventTrackTypeNumVo> queryTgNumByDept(@Param("deptName") String deptName,@Param("typeId")Long typeId,@Param("siteId") Long siteId);
......
...@@ -423,19 +423,14 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr ...@@ -423,19 +423,14 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
} }
} }
List<EventTrackTypeNumVo> eventTrackTypeNumVoList = null; List<EventTrackTypeNumVo> eventTrackTypeNumVoList = null;
logger.info("埋点统计行为统计入参date:{},isPre:{}, types:{}, dateString:{}, siteId:{}, subIdList:{}", date, isPre, types, dateString, context.getSiteId(), subIdList);
//判断是否获取阅读量 //判断是否获取阅读量
// if(types.get(0).equals(6)){ if(types.get(0).equals(6)){
//阅读量 eventTrackTypeNumVoList = this.baseMapper.queryNumByTypeInformation(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
// List<String> subIdList = Lists.newArrayList(); } else {
// for(DataClassification item : classificationList){
// subIdList.add(item.getId().toString());
// }
// eventTrackTypeNumVoList = this.baseMapper.queryNumByTypeInformation(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
// } else {
logger.info("埋点统计行为统计入参date:{},isPre:{}, types:{}, subName:{}, siteId:{}, subIdList:{}", date, isPre, types, subIdList, context.getSiteId(), subIdList);
eventTrackTypeNumVoList = this.baseMapper.queryNumByType(null,date,dateString,types,subIdList,context.getSiteId(), isPre); eventTrackTypeNumVoList = this.baseMapper.queryNumByType(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
logger.info("埋点统计行为统计查询结果:{}", JSONUtil.toJsonStr(eventTrackTypeNumVoList)); logger.info("埋点统计行为统计查询结果:{}", JSONUtil.toJsonStr(eventTrackTypeNumVoList));
// } }
// if(CollectionUtil.isNotEmpty(subNameList)){ // if(CollectionUtil.isNotEmpty(subNameList)){
// List<EventTrackTypeNumVo> finalEventTrackTypeNumVoList = eventTrackTypeNumVoList; // List<EventTrackTypeNumVo> finalEventTrackTypeNumVoList = eventTrackTypeNumVoList;
// subNameList.stream().forEach(name->{ // subNameList.stream().forEach(name->{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment