springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/QryReportResp.java
New file @@ -0,0 +1,17 @@ package com.panzhihua.common.model.dtos.partybuilding; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class QryReportResp { @ApiModelProperty("分类id") private String categoryId; @ApiModelProperty("分类名称") private String categoryName; @ApiModelProperty("数量") private String sum; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/common/PbCheckUnitStatisticsVo.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; /** * @title: PbCheckUnitStatisticsTopVo @@ -34,4 +36,6 @@ @ApiModelProperty(value = "机关单位累计总积分") private Integer organSumIntegral; @ApiModelProperty(value = "服务时长") private Long serviceTime; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java
@@ -1,6 +1,7 @@ package com.panzhihua.common.model.vos.neighbor; import com.panzhihua.common.model.vos.PageVO; import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,4 +38,7 @@ @ApiModelProperty("报道党员累计总积分") private Long partySumCount; @ApiModelProperty("党员数据--聚合") private List<PbCheckUnitStatisticsVo> groupPartyCount; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -18,6 +18,7 @@ import com.panzhihua.common.model.dtos.community.sanshuo.*; import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO; import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto; import com.panzhihua.common.model.dtos.partybuilding.QryReportResp; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO; import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO; @@ -11905,4 +11906,6 @@ R<AreaStreetDetail> areaStreetDetail(@RequestParam("code") String code, @RequestParam("type") String type); @GetMapping("/largeScreen/qryReport") R<List<QryReportResp>> qryReport(@RequestParam(value = "yearTime",required = false) String yearTime); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.dtos.community.building.BuildingDto; import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail; import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp; import com.panzhihua.common.model.dtos.partybuilding.QryReportResp; import com.panzhihua.common.model.vos.community.ComActSocialOrgVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo; @@ -96,6 +97,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import java.util.List; @Slf4j @Api(tags = {"大屏统计数据模块"}) @@ -799,4 +802,14 @@ @RequestParam("type") String type){ return communityService.areaStreetDetail(code, type); } /** * 双报到双服务 */ @GetMapping("/qryReport") public R<List<QryReportResp>> qryReport(@RequestParam(value = "yearTime",required = false) String yearTime){ return communityService.qryReport(yearTime); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/LargeScreenApi.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail; import com.panzhihua.common.model.dtos.community.large.AreaStreetDetailResp; import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp; import com.panzhihua.common.model.dtos.partybuilding.QryReportResp; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActDynVO; import com.panzhihua.common.service.community.CommunityService; @@ -14,6 +15,8 @@ import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @Slf4j @RestController @@ -104,6 +107,12 @@ return R.ok(comStreetService.areaStreetDetail(code, type)); } /** * 双报到双服务 */ @GetMapping("/qryReport") public R<List<QryReportResp>> qryReport(@RequestParam(value = "yearTime",required = false) String yearTime){ return R.ok(comStreetService.qryReport(yearTime)); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -5,6 +5,7 @@ import com.panzhihua.common.model.dtos.community.building.BuildingDto; import com.panzhihua.common.model.dtos.community.large.AreaStreetDetailResp; import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp; import com.panzhihua.common.model.dtos.partybuilding.QryReportResp; import com.panzhihua.common.model.vos.area.StreetAndBuildVO; import com.panzhihua.common.model.vos.community.ComActPasswordVo; import com.panzhihua.common.model.vos.community.bigscreen.ScreenStatics; @@ -206,4 +207,6 @@ AreaStreetDetailResp selectVillage(@Param("ids") List<Long> ids,@Param("type") String type); EventPopulationSpecialStatisticsVO selectEvent(@Param("ids") List<Long> ids); List<QryReportResp> qryReport(String yearTime); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComStreetService.java
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail; import com.panzhihua.common.model.dtos.community.large.AreaStreetDetailResp; import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp; import com.panzhihua.common.model.dtos.partybuilding.QryReportResp; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.community.ComStreetVO; @@ -101,4 +102,6 @@ SumAreaStreetResp sumAreaStreet(); AreaStreetDetail areaStreetDetail(String code, String type); List<QryReportResp> qryReport(String yearTime); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.PageUtil; import cn.hutool.core.collection.CollUtil; @@ -14,6 +15,7 @@ import com.panzhihua.common.model.dtos.neighbor.*; import com.panzhihua.common.model.vos.PageVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.common.PbCheckUnitStatisticsVo; import com.panzhihua.common.model.vos.neighbor.*; import com.panzhihua.common.model.vos.user.AdministratorsUserVO; import com.panzhihua.common.service.user.UserService; @@ -37,6 +39,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -1377,6 +1380,27 @@ } activityVO.setUnitList(unitPage); activityVO.setPartyMemberList(memberPage); //党员数据 聚合 Map<String, Long> map = new HashMap<>(); partyMemberAnalysisVOS.forEach(vo->{ String name = vo.getBelongTo(); Long time = Long.valueOf(vo.getServiceTime()); if (map.containsKey(name)) { time += map.get(name); } map.put(name, time); }); if(CollectionUtil.isNotEmpty(map)){ List<PbCheckUnitStatisticsVo> list = new ArrayList<>(); map.keySet().forEach(vo->{ PbCheckUnitStatisticsVo dto = new PbCheckUnitStatisticsVo(); dto.setBelongTo(vo); dto.setServiceTime(map.get(vo)); list.add(dto); }); activityVO.setGroupPartyCount(list); } return R.ok(activityVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -10,12 +10,14 @@ import javax.annotation.Resource; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.panzhihua.common.model.dtos.community.building.BuildingDto; import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail; import com.panzhihua.common.model.dtos.community.large.AreaStreetDetailResp; import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp; import com.panzhihua.common.model.dtos.partybuilding.QryReportResp; import com.panzhihua.common.model.vos.StreetVO; import com.panzhihua.common.model.vos.area.StreetAndBuildVO; import com.panzhihua.common.model.vos.community.bigscreen.ScreenStatics; @@ -396,12 +398,21 @@ List<Long> ids = doList.stream().map(ComActDO::getCommunityId).collect(Collectors.toList()); AreaStreetDetail result = new AreaStreetDetail(); if(CollectionUtil.isNotEmpty(ids)){ //查询 街道相关信息 AreaStreetDetailResp village = comActDAO.selectVillage(ids,type); result.setAreaStreetDetailResp(village); //查询 人口相关数据 EventPopulationSpecialStatisticsVO eventResult = comActDAO.selectEvent(ids); result.setEventPopulationVO(eventResult); } return result; } @Override public List<QryReportResp> qryReport(String yearTime) { List<QryReportResp> result = comActDAO.qryReport(yearTime); return result; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDaoMapper.xml
@@ -315,5 +315,20 @@ ) and label like concat('%','留守','%') ) as lsTotal </select> <select id="qryReport" resultType="com.panzhihua.common.model.dtos.partybuilding.QryReportResp"> SELECT ctn.id as categoryId, sum( IF(npi.id is null,0,1) ) as sum, ctn.`name` as categoryName FROM com_act_neighbor_circle_topic_new AS ctn LEFT JOIN new_fight_need_problem_inventory AS npi ON npi.classify_id = ctn.id WHERE npi.creation_time >= concat(#{yearTime},'-01-01 00:00:00') AND npi.creation_time <= concat(#{yearTime},'-12-31 59:59:59') GROUP BY ctn.id </select> </mapper>
