springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -36,4 +36,7 @@ @ApiModelProperty(value = "社区id",hidden = true) private Long communityId; @ApiModelProperty(value="发布状态(1.待审核 2.显示 3.隐藏 4.驳回)") private Integer status; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java
@@ -32,4 +32,10 @@ @ApiModelProperty("特殊群体") private Integer specialTotal; /** * 小区总数 */ @ApiModelProperty("小区总数") private Integer villageTotal; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/civil/CivilVillageStatisticsVO.java
@@ -24,6 +24,42 @@ private String villageImages; @ApiModelProperty("小区id") private String villageId; private Long villageId; @ApiModelProperty("总户数") private Integer houseNum; @ApiModelProperty("总人数") private Integer peopleNum; @ApiModelProperty("户籍人数") private Integer registerNum; @ApiModelProperty("流动人数") private Integer flowNum; @ApiModelProperty("楼栋长数量") private Integer buildingPeopleNum; @ApiModelProperty("居民小组长数量") private Integer smallHeadmanNum; @ApiModelProperty("党小组长数量") private Integer partyPeopleNum; @ApiModelProperty("妇女小组长数量") private Integer womanPeopleNum; @ApiModelProperty("卫生员数量") private Integer hygienePeopleNum; @ApiModelProperty("安全员数量") private Integer securityPeopleNum; @ApiModelProperty("监督员数量") private Integer supervisePeopleNum; @ApiModelProperty("其他人员") private Integer otherPeopleNum; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/screen/event/EventStatisticsVO.java
@@ -1,5 +1,7 @@ package com.panzhihua.common.model.vos.community.screen.event; import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO; import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,4 +24,10 @@ @ApiModelProperty("社区事件数据") private List<EventGridIncidentStatisticsVO> gridIncidentList; @ApiModelProperty("小区列表数据") private List<CivilVillageStatisticsVO> villageStatisticsList; @ApiModelProperty("人口统计数据") private ComMngPopulationTotalVO populationTotalVO; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ScreenWorkApi.java
@@ -5,11 +5,18 @@ import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO; import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.screen.work.ActActivityListVO; import com.panzhihua.common.model.vos.community.screen.work.ActActivityPeopleListVO; import com.panzhihua.common.model.vos.community.screen.work.DiscussListVO; import com.panzhihua.common.model.vos.community.screen.work.MicroListVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentByAdminVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyByAdminVO; import com.panzhihua.common.model.vos.neighbor.DetailNeighborCircleAdminVO; import com.panzhihua.common.model.vos.screen.*; import com.panzhihua.common.service.community.CommunityService; import io.swagger.annotations.Api; @@ -149,4 +156,37 @@ return communityService.getScreenMicroList(microListDTO); } @ApiOperation(value = "工作大屏邻里圈列表接口@lyq",response = ComActNeighborCircleAdminVO.class) @PostMapping("/neighbor/list") public R neighborList(@RequestBody ComActNeighborCircleAdminDTO neighborCircleAdminDTO) { if(neighborCircleAdminDTO.getCommunityId() == null){ return R.fail("参数错误"); } return communityService.pageNeighborByAdmin(neighborCircleAdminDTO); } @ApiOperation(value = "工作大屏邻里圈详情接口@lyq",response = ComActNeighborCircleAdminVO.class) @GetMapping("/neighbor/detail") public R neighborDetail(@RequestParam("id")Long id) { return communityService.detailNeighborByAdmin(id); } @ApiOperation(value = "工作大屏邻里圈详情的所有评论接口@lyq",response = ComActNeighborCommentByAdminVO.class) @PostMapping("/neighbor/detail/comment") public R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto){ return communityService.detailNeighborAllCommentByAdmin(dto); } @ApiOperation(value = "工作大屏邻里圈评论详情接口@lyq",response = ComActNeighborCommentByAdminVO.class) @GetMapping("/neighbor/detail/comment/detail") public R detailNeighborCommentByAdmin(@RequestParam("id") Long id){ return communityService.detailNeighborCommentByAdmin(id); } @ApiOperation(value = "工作大屏邻里圈评论详情回复列表接口@lyq",response = ComActNeighborCommentReplyByAdminVO.class) @PostMapping("/neighbor/detail/comment/reply") public R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto){ return communityService.detailNeighborCommentAllReply(dto); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -84,6 +84,9 @@ "<if test='neighborCircleAdminDTO.startAt != null and neighborCircleAdminDTO.endAt !=null '>" + "and nc.create_at between #{neighborCircleAdminDTO.startAt} and #{neighborCircleAdminDTO.endAt} \n" + " </if> " + "<if test='neighborCircleAdminDTO.status != null '>" + "and nc.status = #{neighborCircleAdminDTO.status} " + " </if> " + "</where>"+ "order by " + "case when nc.`status`=1 then 0 else 1 end, \n" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -244,6 +244,7 @@ ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 1) as localTotal " + ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " + ",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " + ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " + " from com_mng_population as cmp where act_id = #{communityId}") ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId); @@ -736,6 +737,17 @@ " community_id = #{communityId}") List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId); @Select("SELECT " + " count( id ) AS peopleNum, " + " ( SELECT count( id ) FROM com_mng_population_house AS cmph WHERE village_id = #{villageId} ) AS houseNum, " + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 1 ) AS registerNum, " + " ( SELECT count( id ) FROM com_mng_population WHERE village_id = #{villageId} AND out_or_local = 2 ) AS flowNum " + "FROM " + " com_mng_population AS cmp " + "WHERE " + " village_id = #{villageId}") CivilVillageStatisticsVO getCivilScreenVillageStatistics(@Param("villageId") Long villageId); @Select("SELECT COUNT(id) AS man,(SELECT COUNT(id) FROM com_mng_population WHERE sex = 2 AND act_id = #{communityId}) AS woman FROM com_mng_population WHERE sex = 1 AND act_id = #{communityId}") Map<String, Long> countBySex(@Param("communityId") Long communityId); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -1013,6 +1013,22 @@ List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId); statisticsVO.setGridIncidentList(gridIncidentList); //查询小区列表 List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId); if(!villageStatisticsList.isEmpty()){ villageStatisticsList.forEach(village -> { CivilVillageStatisticsVO villageStatisticsVO = this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId()); if(villageStatisticsVO != null){ BeanUtils.copyProperties(villageStatisticsVO,village); } }); } statisticsVO.setVillageStatisticsList(villageStatisticsList); //查询统计人口数据 ComMngPopulationTotalVO populationTotalVO = populationDAO.getPopulationTotalByAdmin(communityId); statisticsVO.setPopulationTotalVO(populationTotalVO); return R.ok(statisticsVO); }
