工作台面板问题修复

cloud-site-service/src/main/java/com/yizhi/site/application/mapper/EventTrackMapper.java

@@ -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,
                                              @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);
 
     List<EventTrackTypeNumVo> queryTgNumByDept(@Param("deptName") String deptName,@Param("typeId")Long typeId,@Param("siteId") Long siteId);

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/EventTrackServiceImpl.java

@@ -423,19 +423,14 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
             }
         }
         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)){
-            //阅读量
-//            List<String> subIdList = Lists.newArrayList();
-//            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);
+        if(types.get(0).equals(6)){
+            eventTrackTypeNumVoList = this.baseMapper.queryNumByTypeInformation(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
+        } else {
             eventTrackTypeNumVoList = this.baseMapper.queryNumByType(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
             logger.info("埋点统计行为统计查询结果:{}", JSONUtil.toJsonStr(eventTrackTypeNumVoList));
-//        }
+        }
 //        if(CollectionUtil.isNotEmpty(subNameList)){
 //            List<EventTrackTypeNumVo> finalEventTrackTypeNumVoList = eventTrackTypeNumVoList;
 //            subNameList.stream().forEach(name->{