springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/west/PartyBuildingComPbDynVO.java
@@ -102,4 +102,6 @@ @ApiModelProperty("排序方式 正序 ASC") private String sort; private String appId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingWestService.java
@@ -2,7 +2,7 @@ import java.util.List; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.common.model.vos.partybuilding.west.*; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/BigScreenStatisticsApi.java
@@ -11,6 +11,7 @@ import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo; import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO; import com.panzhihua.common.model.vos.community.social.SocialProjectVO; import com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingComPbDynVO; import com.panzhihua.common.service.partybuilding.PartyBuildingWestService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -78,7 +79,6 @@ import com.panzhihua.common.model.vos.community.switchs.StreetAllAppletsVO; import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAdminVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO; import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO; import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO; import com.panzhihua.common.model.vos.screen.ScreenDrawEventPopulationTotalVO; import com.panzhihua.common.model.vos.screen.ScreenDrawEventVO; @@ -388,9 +388,7 @@ @PostMapping("/comprehensive/partydyn") public R<BigScreenStatisticPartyOrg> partydyn(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO) { partyBuildingComPbDynVO.setType(1); if (isNull(partyBuildingComPbDynVO.getCommunityId())) { partyBuildingComPbDynVO.setCommunityId(this.getCommunityId()); } partyBuildingComPbDynVO.setAppId(this.getAppId()); return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO); } /** springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -208,4 +208,13 @@ @Select("SELECT caa.community_id FROM com_act caa WHERE caa.`name` = ( select ca.`name` FROM com_act ca WHERE ca.community_id =#{id})") List<Long> selectIds(@Param("id") Long id); /** * 根据区域名称查询社区id * @param area * @return */ @Select("select distinct community_id from com_area_town_community where area=#{area}") List<Long> selectDistinctCommunityId(@Param("area") String area); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberWestServiceImpl.java
@@ -574,6 +574,12 @@ communityIds.add(communityId); } partyBuildingComPbDynVO.setCommunityIds(communityIds); }else { //西区大屏 if (CollUtil.isEmpty(partyBuildingComPbDynVO.getCommunityIds()) || "wx0cef797390444b75".equals(partyBuildingComPbDynVO.getAppId())){ List<Long> selectDistinctCommunityId = comPbMemberDAO.selectDistinctCommunityId("西区"); partyBuildingComPbDynVO.setCommunityIds(selectDistinctCommunityId); } } IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO); List<PartyBuildingComPbDynVO> records = iPage.getRecords();
