From 5a8a90c095280fbd2106869ecd2bad10e01a57a6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 18:10:22 +0800
Subject: [PATCH] 12/23  大屏修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |  279 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 277 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 1a1de18..bbd5ca8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -9,7 +9,11 @@
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
+import com.panzhihua.common.model.vos.community.bigscreen.WestScreenStatics;
+import com.panzhihua.common.model.vos.community.screen.civil.*;
+import com.panzhihua.common.model.vos.community.bigscreen.*;
 import com.panzhihua.common.utlis.*;
+import com.panzhihua.service_community.util.WxDataUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -62,6 +66,8 @@
 import cn.hutool.core.util.IdcardUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import static java.util.Objects.nonNull;
 
 /**
  * 实有人口Service实现类
@@ -127,8 +133,12 @@
     private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;
     @Resource
     private ComPensionAuthStatisticsDAO comPensionAuthStatisticsDAO;
+    @Resource
+    private ComActReserveMapper comActReserveMapper;
     @Value("${domain.aesKey:}")
     private String aesKey;
+    @Resource
+    private ComActEasyPhotoDAO comActEasyPhotoDAO;
 
     /**
      * 新增实有人口
@@ -6909,12 +6919,20 @@
             ageStatisticsVO5.setSum(0);
             ageStatisticsVO6.setSum(0);
         } else {
+            int count=ageMap.get("age16").intValue()+ageMap.get("age27").intValue()+ageMap.get("age35").intValue()
+                    +ageMap.get("age45").intValue()+ageMap.get("age55").intValue()+ageMap.get("age55over").intValue();
             ageStatisticsVO1.setSum(ageMap.get("age16").intValue());
+            ageStatisticsVO1.setPercent(ageMap.get("age16").intValue()*100/count);
             ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
+            ageStatisticsVO2.setPercent(ageMap.get("age27").intValue()*100/count);
             ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
+            ageStatisticsVO3.setPercent(ageMap.get("age35").intValue()*100/count);
             ageStatisticsVO4.setSum(ageMap.get("age45").intValue());
+            ageStatisticsVO4.setPercent(ageMap.get("age45").intValue()*100/count);
             ageStatisticsVO5.setSum(ageMap.get("age55").intValue());
+            ageStatisticsVO5.setPercent(ageMap.get("age55").intValue()*100/count);
             ageStatisticsVO6.setSum(ageMap.get("age55over").intValue());
+            ageStatisticsVO6.setPercent(ageMap.get("age55over").intValue()*100/count);
         }
 
         agePopulationList.add(ageStatisticsVO1);
@@ -7043,7 +7061,7 @@
         // 查询特殊人群统计
         List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
 
-        // 查询特殊人群标签列表
+        //查询特殊人群标签列表
         List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
         IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
         otherSpecialVO.setTitle("其他");
@@ -7127,8 +7145,49 @@
 
         // 查询小区列表
         List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
+//        villageStatisticsList.forEach(civilVillageStatisticsVO -> {
+//            civilVillageStatisticsVO.setUserSum(comMngPopulationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getVillageId,civilVillageStatisticsVO.getVillageId())));
+//            List<IndexSpecialStatisticsVO> specialStatisticsVOS = new ArrayList<>();
+//            IndexSpecialStatisticsVO otherSpecial = new IndexSpecialStatisticsVO();
+//            otherSpecial.setTitle("其他");
+//            otherSpecial.setSum(0);
+//            // 查询特殊人群标签列表
+//            List<ComMngUserTagVO> userTagVOS = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
+//
+//            userTagVOS.forEach(comMngUserTagVO -> {
+//              Integer count=comMngPopulationDAO.selectCountByVillageId(civilVillageStatisticsVO.getVillageId(),comMngUserTagVO.getTagName());
+//              IndexSpecialStatisticsVO indexSpecialStatisticsVO=new IndexSpecialStatisticsVO();
+//              indexSpecialStatisticsVO.setTitle(comMngUserTagVO.getTagName());
+//              indexSpecialStatisticsVO.setSum(count);
+//              otherSpecial.setSum(otherSpecial.getSum()+count);
+//              specialStatisticsVOS.add(indexSpecialStatisticsVO);
+//            });
+//            otherSpecial.setSum(civilVillageStatisticsVO.getUserSum()-otherSpecial.getSum());
+//            specialStatisticsVOS.add(otherSpecial);
+//            civilVillageStatisticsVO.setSpecialStatisticsList(specialStatisticsVOS);
+//        });
         civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);
 
+        //查询党建引领数据
+        CivilPartyStatisticsVO civilParty = this.baseMapper.getCivilParty(communityId);
+        if(civilParty != null){
+            civilStatisticsVO.setCivilPartyStatisticsVO(civilParty);
+        }
+        //查询社区治理数据
+        CivilGovernmentStatisticsVO civilGovernment = this.baseMapper.getCivilGovernment(communityId);
+        if(civilGovernment != null){
+            civilStatisticsVO.setCivilGovernmentStatisticsVO(civilGovernment);
+        }
+        //查询网格管理数据
+        CivilGridStatisticsVO civilGrid = this.baseMapper.getCivilGrid(communityId);
+        if(civilGrid != null){
+            civilStatisticsVO.setCivilGridStatisticsVO(civilGrid);
+        }
+        //查询便民服务数据
+        CivilConvenienceStatisticsVO civilConvenience = this.baseMapper.getCivilConvenience(communityId);
+        if(civilConvenience != null){
+            civilStatisticsVO.setCivilConvenienceStatisticsVO(civilConvenience);
+        }
         return R.ok(civilStatisticsVO);
     }
 
@@ -7337,7 +7396,8 @@
     @Override
     public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
         EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
-        if (eventDetailDTO.getType().equals(7)) {// 随手拍详情
+        Integer eventType = eventDetailDTO.getEventType();
+        if (eventDetailDTO.getType().equals(7) || (nonNull(eventType) && eventType.equals(2))) {// 随手拍详情
             statisticsVO = this.baseMapper.getEventScreenSSPDateil(eventDetailDTO.getEventId());
             if (statisticsVO != null && StringUtils.isNotEmpty(statisticsVO.getPhotoPathList())) {
                 statisticsVO.setDangerLevel("0");
@@ -7699,6 +7759,167 @@
         return R.ok(this.comMngPopulationDAO.specialInputUserExport(pageInputUserDTO));
     }
 
+    @Override
+    public R westScreenStatics() {
+        WestScreenStatics westScreenStatics=this.comMngPopulationDAO.westScreenStatics();
+        WxDataUtil wxDataUtil=new WxDataUtil();
+        westScreenStatics.setDayUser(wxDataUtil.getDayUser());
+        westScreenStatics.setCountUser(wxDataUtil.getMonthUser());
+        return R.ok(westScreenStatics);
+    }
+
+    @Override
+    public R getComprehensivePopulationStatics(Long streetId){
+        EventPopulationStatisticsVO statisticsVo = new EventPopulationStatisticsVO();
+        //查询人口数据
+        List<EventPopulationBasicsStatisticsVO> basicsList = comMngPopulationDAO.getBasicsList(streetId);
+        if(basicsList != null){
+            for (EventPopulationBasicsStatisticsVO basics : basicsList) {
+                statisticsVo.setPopulationNum(statisticsVo.getPopulationNum() + basics.getPopulationNum());
+                statisticsVo.setVillageNum(statisticsVo.getVillageNum() + basics.getVillageNum());
+                statisticsVo.setHouseNum(statisticsVo.getHouseNum() + basics.getHouseNum());
+            }
+            statisticsVo.setBasicsList(basicsList);
+        }
+        //查询特殊人群数据
+        EventPopulationSpecialStatisticsVO populationSpecial = comMngPopulationDAO.getPopulationSpecial(streetId);
+        if(populationSpecial != null){
+            populationSpecial.setOtherTotal(populationSpecial.getZjTotal() + populationSpecial.getSfTotal()
+                    + populationSpecial.getXsTotal() + populationSpecial.getXjTotal()
+                    + populationSpecial.getJzTotal() + populationSpecial.getXdTotal());
+            populationSpecial.setLnTotal(comMngPopulationDAO.getPopulationAge(streetId,60));
+            populationSpecial.setGlTotal(comMngPopulationDAO.getPopulationAge(streetId,80));
+            statisticsVo.setSpecialStatisticsVo(populationSpecial);
+        }
+        return R.ok(statisticsVo);
+    }
+
+    @Override
+    public R getComprehensiveStreetList(){
+        return R.ok(comMngPopulationDAO.getComprehensiveStreetList());
+    }
+
+    @Override
+    public R indexInfo(Long communityId) {
+        IndexInfo indexInfo=new IndexInfo();
+        //基础数据
+        BaseInfo baseInfo=this.comMngPopulationDAO.baseInfo(communityId);
+        indexInfo.setBaseInfo(baseInfo);
+        // 查询实有人口统计模块
+        IndexPopulationStatisticsVO populationStatisticsVO = new IndexPopulationStatisticsVO();
+        // 查询实有人口性别统计
+        List<IndexPopulationSexStatisticsVO> sexPopulationList =
+                comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
+        populationStatisticsVO.setSexPopulationList(sexPopulationList);
+        // 查询实有人口年龄统计
+        List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(communityId);
+        populationStatisticsVO.setAgePopulationList(agePopulationList);
+        indexInfo.setIndexPopulationStatisticsVO(populationStatisticsVO);
+        // 查询特殊人群统计
+        List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
+
+        // 查询特殊人群标签列表
+        List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
+        IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
+        otherSpecialVO.setTitle("其他");
+        otherSpecialVO.setSum(0);
+        int countAll=comMngPopulationDAO.getSpecialStatistics(communityId);
+        if (!userTagList.isEmpty()) {
+            userTagList.forEach(userTag -> {
+                if (userTag != null) {
+                    if (userTag.getSysFlag().equals(0)) {
+                        Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
+                        otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
+                        otherSpecialVO.setPercent(otherSpecialVO.getSum()*100/countAll);
+                    } else {
+                        if (StringUtils.isNotEmpty(userTag.getTagName())) {
+                            if (userTag.getTagName().equals("高龄老人")) {
+                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+                                specialStatisticsVO.setTitle(userTag.getTagName());
+                                specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
+                                specialStatisticsVO.setPercent(specialStatisticsVO.getSum()*100/countAll);
+                                specialStatisticsVOList.add(specialStatisticsVO);
+                            } else {
+                                IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+                                specialStatisticsVO.setTitle(userTag.getTagName());
+                                Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
+                                specialStatisticsVO.setSum(count);
+                                specialStatisticsVO.setPercent(specialStatisticsVO.getSum()*100/countAll);
+                                specialStatisticsVOList.add(specialStatisticsVO);
+                            }
+                        }
+                    }
+                }
+            });
+        }
+        specialStatisticsVOList.add(otherSpecialVO);
+        indexInfo.setSpecialStatisticsVOList(specialStatisticsVOList);
+        // 查询网格化治理
+        IndexEventGridStatisticsVO eventGridStatisticsVO = new IndexEventGridStatisticsVO();
+        List<IndexGridStatisticsVO> gridStatisticsList = new ArrayList<>();
+        // 查询网格化事件数据
+        IndexGridEventStatisticsVO gridEventStatistics = comMngPopulationDAO.getGridEventStatisticsList(communityId);
+        int count=gridEventStatistics.getEventGGTotal()+gridEventStatistics.getEventBWDTotal()+gridEventStatistics.getEventMDTotal()+gridEventStatistics.getEventTFTotal()+gridEventStatistics.getEventTSTotal()+gridEventStatistics.getEventZATotal();
+        gridEventStatistics.setGgPercent(gridEventStatistics.getEventGGTotal()*100/count);
+        gridEventStatistics.setBwdPercent(gridEventStatistics.getEventBWDTotal()*100/count);
+        gridEventStatistics.setMdPercent(gridEventStatistics.getEventMDTotal()*100/count);
+        gridEventStatistics.setTfPercent(gridEventStatistics.getEventTFTotal()*100/count);
+        gridEventStatistics.setTsPercent(gridEventStatistics.getEventTSTotal()*100/count);
+        gridEventStatistics.setZaPercent(gridEventStatistics.getEventZATotal()*100/count);
+        eventGridStatisticsVO.setGridEventStatisticsList(gridEventStatistics);
+        // 查询网格数据
+        List<EventGridDataVO> gridDataList = comMngPopulationDAO.getGridDataListByCommunityId(communityId);
+        if (!gridDataList.isEmpty()) {
+            gridDataList.forEach(gridData -> {
+                if (gridData != null) {
+                    IndexGridStatisticsVO gridStatisticsVO = new IndexGridStatisticsVO();
+                    gridStatisticsVO.setEventData(gridData.getGridName());
+                    // 根据网格id查询网格事件列表
+                    IndexGridEventStatisticsVO gridEventList =
+                            comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
+                    gridStatisticsVO.setGridEventStatisticsList(gridEventList);
+                    gridStatisticsList.add(gridStatisticsVO);
+                }
+            });
+        }
+        eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList);
+        indexInfo.setEventGridStatisticsVO(eventGridStatisticsVO);
+        //首页业务统计
+        IndexDynamic indexDynamic=this.populationDAO.indexDynamic(communityId);
+        indexInfo.setIndexDynamic(indexDynamic);
+        //返攀登记居家隔离数据统计
+        IndexReserve indexReserve=new IndexReserve();
+        IndexBackReserve indexBackReserve=new IndexBackReserve();
+        indexBackReserve.setCount(comActReserveMapper.indexBackReserve(communityId));
+        indexBackReserve.setIndexReserveSubList(comActReserveMapper.indexBackReserveSub(communityId));
+        indexBackReserve.getIndexReserveSubList().forEach(indexReserveSub -> {
+            if(indexReserveSub.getAllCount()!=0){
+                indexReserveSub.setPercent(indexReserveSub.getNum()*100/indexReserveSub.getAllCount());
+            }
+            else {
+                indexReserveSub.setPercent(0);
+            }
+        });
+        IndexHomeQuarantine indexHomeQuarantine=new IndexHomeQuarantine();
+        indexHomeQuarantine.setCount(comActReserveMapper.indexHomeQuarantine(communityId));
+        indexHomeQuarantine.setIndexReserveSubList(comActReserveMapper.IndexHomeQuarantineSub(communityId));
+        indexHomeQuarantine.getIndexReserveSubList().forEach(indexReserveSub -> {
+            if(indexReserveSub.getAllCount()!=0){
+                indexReserveSub.setPercent(indexReserveSub.getNum()*100/indexReserveSub.getAllCount());
+            }
+            else {
+                indexReserveSub.setPercent(0);
+            }
+        });
+        indexReserve.setIndexBackReserve(indexBackReserve);
+        indexReserve.setIndexHomeQuarantine(indexHomeQuarantine);
+        indexInfo.setIndexReserve(indexReserve);
+        BigscreenGridsGovernanceStatisticsVO bigscreenGridsGovernanceStatisticsVO=comActEasyPhotoDAO.selectBigscreenGridsGovern(communityId);
+        indexInfo.setBigScreenGridStaticsReturn(setData(bigscreenGridsGovernanceStatisticsVO));
+
+        return R.ok(indexInfo);
+    }
+
     private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
         mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
         mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
@@ -7939,4 +8160,58 @@
         return ObjectUtils.isEmpty(hashMap.get(key));
     }
 
+
+    private BigScreenGridStaticsReturn setData(BigscreenGridsGovernanceStatisticsVO bigscreenGridsGovernanceStatisticsVO){
+        List<BigScreenGridStaticsReturn> bigScreenGridStaticsReturnList=new ArrayList<>();
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn.setCount(bigscreenGridsGovernanceStatisticsVO.getEventTotal()+bigscreenGridsGovernanceStatisticsVO.getOtherTotal()+bigscreenGridsGovernanceStatisticsVO.getSafety());
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn1=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn1.setTitle("突发事件报告");
+        bigScreenGridStaticsReturn1.setNum(bigscreenGridsGovernanceStatisticsVO.getEventTFTotal());
+        bigScreenGridStaticsReturn1.setPercent(bigscreenGridsGovernanceStatisticsVO.getEventTFTotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn1);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn2=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn2.setTitle("特殊人群服务");
+        bigScreenGridStaticsReturn2.setNum(bigscreenGridsGovernanceStatisticsVO.getEventTSTotal());
+        bigScreenGridStaticsReturn2.setPercent(bigscreenGridsGovernanceStatisticsVO.getEventTSTotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn2);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn3=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn3.setTitle("治安防控");
+        bigScreenGridStaticsReturn3.setNum(bigscreenGridsGovernanceStatisticsVO.getEventZATotal());
+        bigScreenGridStaticsReturn3.setPercent(bigscreenGridsGovernanceStatisticsVO.getEventZATotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn3);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn4=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn4.setTitle("民生服务");
+        bigScreenGridStaticsReturn4.setNum(bigscreenGridsGovernanceStatisticsVO.getEventMSTotal());
+        bigScreenGridStaticsReturn4.setPercent(bigscreenGridsGovernanceStatisticsVO.getEventMSTotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn4);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn5=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn5.setTitle("矛盾劝解");
+        bigScreenGridStaticsReturn5.setNum(bigscreenGridsGovernanceStatisticsVO.getEventMDTotal());
+        bigScreenGridStaticsReturn5.setPercent(bigscreenGridsGovernanceStatisticsVO.getEventMDTotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn5);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn6=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn6.setTitle("防灾减灾");
+        bigScreenGridStaticsReturn6.setNum(bigscreenGridsGovernanceStatisticsVO.getEventFJTotal());
+        bigScreenGridStaticsReturn6.setPercent(bigscreenGridsGovernanceStatisticsVO.getEventFJTotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn6);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn7=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn7.setTitle("政策法规宣传");
+        bigScreenGridStaticsReturn7.setNum(bigscreenGridsGovernanceStatisticsVO.getEventFGTotal());
+        bigScreenGridStaticsReturn7.setPercent(bigscreenGridsGovernanceStatisticsVO.getEventFGTotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn7);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn8=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn8.setTitle("安全巡查");
+        bigScreenGridStaticsReturn8.setNum(bigscreenGridsGovernanceStatisticsVO.getSafety());
+        bigScreenGridStaticsReturn8.setPercent(bigscreenGridsGovernanceStatisticsVO.getSafety()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn8);
+        BigScreenGridStaticsReturn bigScreenGridStaticsReturn9=new BigScreenGridStaticsReturn();
+        bigScreenGridStaticsReturn9.setTitle("其他");
+        bigScreenGridStaticsReturn9.setNum(bigscreenGridsGovernanceStatisticsVO.getOtherTotal());
+        bigScreenGridStaticsReturn9.setPercent(bigscreenGridsGovernanceStatisticsVO.getOtherTotal()*100/bigScreenGridStaticsReturn.getCount());
+        bigScreenGridStaticsReturnList.add(bigScreenGridStaticsReturn9);
+        bigScreenGridStaticsReturn.setBigScreenGridStaticsReturnList(bigScreenGridStaticsReturnList);
+        return bigScreenGridStaticsReturn;
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.7.1