Merge remote-tracking branch 'origin/master'

huanghongfa

2021-09-26 e33adc1fa2764d4bdf273e3634d2fc6a78707803

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -1945,8 +1945,8 @@
    public R getGridEventStatisticsByApp(Long gridId, Long userId) {
        GridEventStatisticsVO result = this.baseMapper.getGridEventStatisticsByApp(gridId);
        if (result != null) {
            result.setTodayNum(result.getTodayNum() + result.getZfTodayNum());
            result.setMonthNum(result.getMonthNum() + result.getZfMonthNum());
            result.setTodayNum(result.getTodayNum() + result.getZfTodayNum() + result.getSspTodayNum());
            result.setMonthNum(result.getMonthNum() + result.getZfMonthNum() + result.getSspMonthNum());

            // 查询当前网格员下管理的楼栋名称
            List<Map<String, Object>> buildNameList = this.baseMapper.getMemberBuildName(userId);