From 6034e6e4d88537a72e9d3172d8efdfe322cadb06 Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 12 Feb 2020 15:07:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E6=83=85=E5=86=B5=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/user/result/GridOpeningResultDTO.java | 41 ++- .../modules/user/dao/UserAnalysisDao.java | 92 +++-- .../service/impl/UserAnalysisServiceImpl.java | 109 +++--- .../resources/mapper/user/UserAnalysisDao.xml | 326 +++++------------- 4 files changed, 226 insertions(+), 342 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java index 458640970..6f60d3e8e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridOpeningResultDTO.java @@ -6,15 +6,17 @@ import lombok.Data; import java.io.Serializable; /** - * @author: qushutong - * @Date: 2020/2/11 13:09 - * @Description: 开通网格情况 + * @author: qushutong + * @Date: 2020/2/11 13:09 + * @Description: 开通网格情况 */ @Data public class GridOpeningResultDTO implements Serializable { private static final long serialVersionUID = -852226852590425991L; + private String gridId; + /** * 街道社区网格 */ @@ -22,56 +24,65 @@ public class GridOpeningResultDTO implements Serializable { /** * 用户注册数 */ - private String registerCount; + private Integer registerCount; + /** + * 认证居民 + */ + private Integer residentCount; /** - * 党员注册数 + * 认证党员数 */ - private String partyCount; + private Integer partyCount; /** * 居民扫码数 */ - private String ewmCount; + private Integer ewmCount; /** * 新闻数 */ - private String newsCount; + private Integer newsCount; /** * 通知数 */ - private String noticeCount; + private Integer noticeCount; /** * 议题数 */ - private String eventCount; + private Integer eventCount; /** * 项目数 */ - private String itemCount; + private Integer itemCount; /** * 项目结案数 */ - private String itemCloseCount; + private Integer itemCloseCount; /** * 社群数 */ - private String communityCount; + private Integer communityCount; /** * 社群成员数 */ - private String communityMemberCount; + private Integer communityMemberCount; /** * 社群话题数 */ - private String communityTopicCount; + private Integer communityTopicCount; + + /** + * 网格长姓名 + */ + private String gridLeader; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 0be55f270..34dae6c4e 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java @@ -53,42 +53,42 @@ public interface UserAnalysisDao extends BaseMapper { /*** - * 新闻 - * @param + * 根据网格统计新闻发布数 + * @param params * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ - List selectListNewsCount(); + List selectListNewsCount(Map params); /*** * 通知 - * @param + * @param params * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ - List selectListNoticeCount(); + List selectListNoticeCount(Map params); /*** * 议题数 - * @param + * @param params * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ - List selectListEventCount(); + List selectListEventCount(Map params); /*** - * 项目数 - * @param + * 项目数，项目结案数 + * @param params * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ - List selectListItemCount(); + List selectListItemCount(Map params); /** * 查询用户数据排行 @@ -111,72 +111,62 @@ public interface UserAnalysisDao extends BaseMapper { List selectListPartyAuthFailureCountByStreetId(@Param("streetIdList") List streetIdList); /*** - * 项目结案数 - * @param - * @return java.util.List - * @author qushutong - * @date 2020/2/11 14:10 - */ - List selectListItemCloseCount(); - - - /*** - * 社群数 - * @param - * @return java.util.List - * @author qushutong - * @date 2020/2/11 14:10 - */ - List selectListCommunityCount(); - - - /*** - * 社群成员数 - * @param + * 社群数 社群成员数 社群话题数 + * @param params * @return java.util.List * @author qushutong * @date 2020/2/11 14:10 */ - List selectListCommunityMemberCount(); - + List selectListCommunityCount(Map params); - /*** - * 社群话题数 - * @param - * @return java.util.List - * @author qushutong - * @date 2020/2/11 14:10 - */ - List selectListCommunityTopicCount(); /** - *用户数据统计 + * 用户数据统计 * - * @author wangtong - * @date 2020/2/11 14:55 * @param [formDTO] * @return com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO + * @author wangtong + * @date 2020/2/11 14:55 */ UserAnalysisCountDTO getUserStatistics(UserCountDTO formDto); /** - *网格数量统计 + * 网格数量统计 * - * @author wangtong - * @date 2020/2/11 14:55 * @param [formDTO] * @return com.elink.esua.epdc.dto.user.result.GriddingCountDTO + * @author wangtong + * @date 2020/2/11 14:55 */ GriddingCountDTO getGridStatistics(UserCountDTO formDto); /** - * @Description 注册用户数排名 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 注册用户数排名 * @Author lpf - * @Date 2020/2/11 + * @Date 2020/2/11 * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ List userRegisterSort(UserSortRankFormDTO formDto, List deptIdList); + /** + * （未）开通网格列表，查询字段：网格的完整机构名称，网格id，网格长名称 + * + * @param params + * @return java.util.List + * @author work@yujt.net.cn + * @date 2020/2/12 13:27 + */ + List selectListGridHasMaCode(Map params); + + /** + * 根据网格id，查询网格内注册用户数，认证党员数，认证居民数 + * + * @param params + * @return java.util.List + * @author work@yujt.net.cn + * @date 2020/2/12 14:06 + */ + List selectListReigistData(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index dfba5a3a7..5001ffbc5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -42,46 +42,68 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl listPageGridOpening(Map params) { - // 注册数 - List registerCountList = baseDao.selectListReigistCount(); - // 党员数 - List partyCountList = baseDao.selectListPartyCount(); - // 居民扫码数 - List ewmCountList = baseDao.selectListEwmCount(); + IPage iPage = this.getPage(params); + List list = baseDao.selectListGridHasMaCode(params); + + PageData page = new PageData<>(list, iPage.getTotal()); + if (CollUtil.isEmpty(list)) { + return page; + } + List gridIdList = Lists.newArrayList(); + for (GridOpeningResultDTO gridOpeningResult : list) { + gridIdList.add(gridOpeningResult.getGridId()); + } + params.put("gridIdList", gridIdList); + // 注册数，认证党员数，认证居民数 + List registerDataList = baseDao.selectListReigistData(params); // 新闻数 - List newsCountList = baseDao.selectListNewsCount(); + List newsCountList = baseDao.selectListNewsCount(params); // 通知数 - List noticeCountList = baseDao.selectListNoticeCount(); + List noticeCountList = baseDao.selectListNoticeCount(params); // 议题数 - List eventCountList = baseDao.selectListEventCount(); - // 项目数 - List itemCountList = baseDao.selectListItemCount(); - // 结案数 - List itemCloseCountList = baseDao.selectListItemCloseCount(); - // 社群数 - List communityCountList = baseDao.selectListCommunityCount(); - // 社群成员数 - List communityMemberCountList = baseDao.selectListCommunityMemberCount(); - // 社群话题数 - List communityTopicCountList = baseDao.selectListCommunityTopicCount(); - GridOpeningResultDTO openingResultDto; - for (int i = 0; i < registerCountList.size(); i++) { - openingResultDto = registerCountList.get(i); - openingResultDto.setRegisterCount(registerCountList.get(i).getRegisterCount()); - openingResultDto.setPartyCount(partyCountList.get(i).getPartyCount()); - openingResultDto.setNewsCount(newsCountList.get(i).getNewsCount()); - openingResultDto.setNoticeCount(noticeCountList.get(i).getNoticeCount()); - openingResultDto.setEwmCount(ewmCountList.get(i).getEwmCount()); - openingResultDto.setEventCount(eventCountList.get(i).getEventCount()); - openingResultDto.setItemCount(itemCountList.get(i).getItemCount()); - openingResultDto.setItemCloseCount(itemCloseCountList.get(i).getItemCloseCount()); - openingResultDto.setCommunityCount(communityCountList.get(i).getCommunityCount()); - openingResultDto.setCommunityMemberCount(communityMemberCountList.get(i).getCommunityMemberCount()); - openingResultDto.setCommunityTopicCount(communityTopicCountList.get(i).getCommunityTopicCount()); - } + List eventCountList = baseDao.selectListEventCount(params); + // 项目数，项目结案数 + List itemCountList = baseDao.selectListItemCount(params); + // 社群数 社群成员数 社群话题数 + List communityCountList = baseDao.selectListCommunityCount(params); - IPage iPage = this.getPage(params); - return new PageData<>(registerCountList, iPage.getTotal()); + for (GridOpeningResultDTO resultDto : list) { + for (GridOpeningResultDTO registerData : registerDataList) { + if(resultDto.getGridId().equals(registerData.getGridId())){ + resultDto.setRegisterCount(registerData.getRegisterCount()); + resultDto.setPartyCount(registerData.getPartyCount()); + resultDto.setRegisterCount(registerData.getRegisterCount()); + } + } + for (GridOpeningResultDTO newsCountData : newsCountList) { + if(resultDto.getGridId().equals(newsCountData.getGridId())){ + resultDto.setNewsCount(newsCountData.getNewsCount()); + } + } + for (GridOpeningResultDTO noticeCounData : noticeCountList) { + if(resultDto.getGridId().equals(noticeCounData.getGridId())){ + resultDto.setNoticeCount(noticeCounData.getNoticeCount()); + } + } + for (GridOpeningResultDTO eventCountData : eventCountList) { + if(resultDto.getGridId().equals(eventCountData.getGridId())){ + resultDto.setEventCount(eventCountData.getEventCount()); + } + } + for (GridOpeningResultDTO itemCountData : itemCountList) { + if(resultDto.getGridId().equals(itemCountData.getGridId())){ + resultDto.setItemCloseCount(itemCountData.getItemCloseCount()); + } + } + for (GridOpeningResultDTO communityCountData : communityCountList) { + if(resultDto.getGridId().equals(communityCountData.getGridId())){ + resultDto.setCommunityCount(communityCountData.getCommunityCount()); + resultDto.setCommunityTopicCount(communityCountData.getCommunityTopicCount()); + resultDto.setCommunityMemberCount(communityCountData.getCommunityMemberCount()); + } + } + } + return page; } @Override @@ -130,12 +152,12 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl data = baseDao.userRegisterSort(formDto, SecurityUser.getUser().getDeptIdList()); - return new Result>().ok(data); } + return new Result>().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index e71255db1..d21e8e057 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -152,269 +152,84 @@ - - - - - - - - + + +