Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-01-30 25f97b89a5819fc434a3ca71f10742567c1897a6

Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

 ycl-platform/src/main/java/com/ycl/service/trend/impl/TrendAnalysisServiceImpl.java

@@ -32,6 +32,6 @@

    @Override
    public List<TrendVo> queryListByCount(TrendAnalysisParam trendAnalysisParam, Integer pageSize, Integer pageNum) {
        return trendAnalysisMapper.selectTrendInfo(trendAnalysisParam).stream().filter(item->"1".equals(item.getCount())).collect(Collectors.toList());
        return trendAnalysisMapper.selectTrendInfo(trendAnalysisParam).stream().filter(item->1==item.getCount()).collect(Collectors.toList());
    }
}

 ycl-platform/src/main/resources/mapper/trend/TrendAnalysisMapper.xml

@@ -21,7 +21,7 @@
        </where>
        GROUP BY
        t1.video_point_id
        count DESC
        ORDER BY count DESC
    </select>

    <select id="selectTrendPointInfo" resultType="com.ycl.vo.TrendVo">