bug修复

huanghongfa

2021-09-29 d97c26f44fe7faa9ab2a2ec3b73d7b0f49140d27

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

@@ -317,7 +317,9 @@

        if (eventMapper.insert(eventDO) == 1) {
            // 如果是特殊人群，则新增特殊人群与事件关系
            if (commonEventAddDTO.getEventType().equals(6)) {
            if (commonEventAddDTO.getEventType().equals(6)
                    && commonEventAddDTO.getPopulationIds() != null
                    && commonEventAddDTO.getPopulationIds().size() > 0) {
                if (commonEventAddDTO.getPopulationIds() != null && commonEventAddDTO.getPopulationIds().size() > 0) {
                    List<EventSpecialCrowdRecordDO> crowdRecordList = new ArrayList<>();
                    commonEventAddDTO.getPopulationIds().forEach(populationId -> {
@@ -1945,8 +1947,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);