修改bug

huanghongfa

2021-07-12 9641ba3c1d91c3105966b2038f97a2db83bbe7b7

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

@@ -121,9 +121,10 @@
                eventVO.setVideos(videoList);

                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(imageUrl)) {
                    eventVO.setGridMemberImageUrl(imageUrl);
                Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(userMap)) {
                    eventVO.setGridMemberName(userMap.get("nick_name"));
                    eventVO.setGridMemberImageUrl(userMap.get("image_url"));
                }
            });
            return R.ok(ipage);
@@ -263,7 +264,7 @@
            }

            //当事件为特殊人群上报时，需要查询事件与人口关联关系
            if(eventDetailsVO.getEventType().equals(6)){
            if(eventDetailsVO.getEventType() != null && eventDetailsVO.getEventType().equals(6)){
                List<EventSpecialPopulationDetailsVO> specialPopulationList = eventSpecialCrowdRecordMapper.getSpecialPopulationIds(eventDetailsVO.getId());
                if(!specialPopulationList.isEmpty()){
                    specialPopulationList.forEach(special -> {
@@ -1264,9 +1265,10 @@
                eventVO.setPics(picList);
                eventVO.setVideos(videoList);
                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(imageUrl)) {
                    eventVO.setGridMemberImageUrl(imageUrl);
                Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(userMap)) {
                    eventVO.setGridMemberName(userMap.get("nick_name"));
                    eventVO.setGridMemberImageUrl(userMap.get("image_url"));
                }
            });
            return R.ok(ipage);
@@ -1325,9 +1327,10 @@
                eventVO.setVideos(videoList);

                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(imageUrl)) {
                    eventVO.setGridMemberImageUrl(imageUrl);
                Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if (StringUtils.isNotEmpty(userMap)) {
                    eventVO.setGridMemberName(userMap.get("nick_name"));
                    eventVO.setGridMemberImageUrl(userMap.get("image_url"));
                }
            });
            return R.ok(ipage);
@@ -1936,6 +1939,16 @@
            statisticsDetailVO.setNoEventZFTotal(0);
        }

        //查询网格
        EventGridDataDO gridDataDO = eventGridDataMapper.selectById(statisticsDTO.getGridId());
        if(gridDataDO != null){
            Map<String,Long> sspCountMap = this.baseMapper.getSSPEventTotal(gridDataDO.getGridCommunityId());
            if(!sspCountMap.isEmpty()){
                statisticsDetailVO.setEventSSPTotal(sspCountMap.get("eventSSPTotal")!=null?sspCountMap.get("eventSSPTotal").intValue():0);
                statisticsDetailVO.setNoEventSSPTotal(sspCountMap.get("noEventSSPTotal")!=null?sspCountMap.get("noEventSSPTotal").intValue():0);
            }
        }

        //统计数据
        Integer sum = statisticsDetailVO.getEventTFTotal() + statisticsDetailVO.getEventMDTotal() + statisticsDetailVO.getEventZATotal()
                + statisticsDetailVO.getEventBWDTotal() + statisticsDetailVO.getEventTSTotal() + statisticsDetailVO.getEventGGTotal()
@@ -2197,7 +2210,12 @@
        IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(), specialPopulationDTO.getPageSize()), specialPopulationDTO);
        if(!specialPopulationVOIPage.getRecords().isEmpty()){
            specialPopulationVOIPage.getRecords().forEach(specialPopulation -> {
                specialPopulation.setAge(IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard()));
                try {
                    Integer age = IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard());
                    specialPopulation.setAge(age);
                }catch (Exception e){
                    log.error("身份证号码转换年龄失败，人员id:" + specialPopulation.getId());
                }
            });
        }
        return R.ok(specialPopulationVOIPage);