springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/DetailNeighborCircleAdminVO.java
@@ -58,4 +58,7 @@ @ApiModelProperty("话题名称") private String topicName; @ApiModelProperty("头像") private String imageUrl; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -88,4 +88,7 @@ @ApiModelProperty(value = "身份证") private String idCard; @ApiModelProperty("头像") private String imageUrl; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -125,7 +125,7 @@ List<StatisticsCommVO> microWishRealizePercent = comActMicroWishDAO.selectRealizePercent(communityId); statisticsVO.setMicroWishRealizePercent(microWishRealizePercent); //微心愿图片 List<String> microWishImages = comActMicroWishDAO.getPassedAllImages(communityId, pageSize); List<String> microWishImages = comActMicroWishDAO.getPassedAllImages(communityId, 20); statisticsVO.setMicroWishImages(microWishImages); //议事投票类型占比 @@ -139,7 +139,7 @@ statisticsVO.setVoteTitles(voteTitles); //邻里圈图片 List<String> neighborImages = comActNeighborCircleDAO.getAllImages(communityId, pageSize); List<String> neighborImages = comActNeighborCircleDAO.getAllImages(communityId, 20); statisticsVO.setNeighborImages(neighborImages); //邻里圈文本内容 List<String> neighborContents = comActNeighborCircleDAO.getContents(communityId, pageSize); @@ -185,7 +185,7 @@ List<String> warehouseLoveTransfer = comActWarehouseDonatesDao.getWarehouseLoveTransfer(communityId, pageSize); statisticsVO.setWarehouseLoveTransfer(warehouseLoveTransfer); //捐赠图片 List<String> warehouseImages = comActWarehouseDonatesDao.getWarehouseImages(communityId, pageSize); List<String> warehouseImages = comActWarehouseDonatesDao.getWarehouseImages(communityId, 20); statisticsVO.setWarehouseImages(warehouseImages); return R.ok(statisticsVO); } @@ -516,7 +516,7 @@ statisticsInfo.setNeighborCircleData(neighborCircleData); if (!neighborCircleData.isEmpty()) { statisticsInfo.setPublishContentNum(neighborCircleData.stream().map(StatisticsCommVO::getNum).mapToInt(Integer::intValue).sum()); statisticsInfo.setPublishTopicNum(neighborCircleData.size()); statisticsInfo.setPublishTopicNum(neighborCircleData.stream().filter(e -> !"无话题".equals(e.getFiled())).collect(Collectors.toList()).size()); } //邻里圈新增折线数据 Date nowDate = new Date(); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -665,6 +665,7 @@ DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO(); BeanUtils.copyProperties(comActNeighborCircleDO, vo); vo.setReleaseName(user.getName()); vo.setImageUrl(user.getImageUrl()); // 查询话题名称 if (comActNeighborCircleDO.getTopicId() != null) { springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDiscussCommentDOMapper.xml
@@ -53,9 +53,7 @@ JOIN sys_user u ON c.user_id = u.user_id LEFT JOIN com_act_discuss_comment_user cu ON c.id=cu.disscuss_comment_id WHERE FIND_IN_SET( c.id, getChildren ( #{parentId} )) AND c.parent_id != 0 AND c.is_del = 2 c.parent_id = #{parentId} AND c.is_del = 2 GROUP BY c.id ORDER BY create_at desc </select> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml
@@ -1071,7 +1071,7 @@ IFNULL(( SELECT count( id ) FROM com_pb_activity WHERE STATUS = 5 AND community_id = camw.community_id ),0) AS partyActivity, IFNULL(( SELECT count( id ) FROM com_act_questnaire WHERE community_id = camw.community_id and is_hide=0 ),0) AS questionnaire, IFNULL(( SELECT count( id ) FROM com_act_dyn WHERE community_id = camw.community_id AND STATUS = 1 ),0) AS dynamic, IFNULL(( SELECT count( id ) FROM com_convenient_merchants WHERE community_id = camw.community_id AND is_del = 0 ),0) AS convenient, IFNULL(( SELECT count( id ) FROM com_convenient_merchants WHERE (community_id = camw.community_id OR community_id = 0) AND is_del = 0 ),0) AS convenient, IFNULL(( SELECT count( id ) FROM com_act_neighbor_circle WHERE community_id = camw.community_id AND is_del = 2 ),0) AS neighbor FROM com_act_micro_wish AS camw WHERE camw.STATUS = 6 AND camw.community_id = #{communityId} springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -19,7 +19,7 @@ select (select count(*) from com_act_work_guide ) guide, (select count(*) from com_act_announcement where community_id = #{communityId}) announcement, (select count(*) from com_elder_auth_elderlies where community_id = #{communityId}) eldersAuth, (select count(*) from com_convenient_merchants where community_id = #{communityId} and is_del =0) convenient, (select count(*) from com_convenient_merchants where (community_id = #{communityId} OR community_id = 0) and is_del =0) convenient, (select count(*) from renting_hourse_register where community_id = #{communityId}) rentingHouse, (select count(*) from com_property_alarm where community_id = #{communityId}) oneButton, (select count(*) from com_pension_auth_pensioners where community_id = #{communityId} ) pensionAuth, springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ConvenientMerchantMapper.xml
@@ -211,18 +211,18 @@ SELECT * FROM ( SELECT id, `name`, consultation_volume, view_num FROM com_convenient_merchants WHERE community_id = #{pagePopularMerchantDTO.communityId} AND is_del = 0 ORDER BY (consultation_volume + consultation_volume) DESC LIMIT 100 WHERE (community_id = #{pagePopularMerchantDTO.communityId} OR community_id = 0) AND is_del = 0 ORDER BY (consultation_volume + consultation_volume) DESC LIMIT 100 ) temp </select> <select id="getIndexMerchantBaseData" resultType="com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo"> SELECT (SELECT 0) AS resourceTypeNum, (SELECT COUNT(id) FROM com_convenient_merchants WHERE community_id = #{communityId} AND is_del = 0) AS merchantNum, (SELECT COUNT(id) FROM com_convenient_merchants WHERE (community_id = #{communityId} OR community_id = 0) AND is_del = 0) AS merchantNum, (SELECT SUM(t1.consultation_volume) FROM com_convenient_consultation_statistics t1 LEFT JOIN com_convenient_merchants t2 ON t1.merchant_id = t2.id WHERE t2.community_id = #{communityId}) AS serviceTimes WHERE (t2.community_id = #{communityId} OR t2.community_id = 0)) AS serviceTimes </select> <select id="selectServiceTypeCircleData" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO"> @@ -230,28 +230,28 @@ FROM com_convenient_service_categories t1 LEFT JOIN com_convenient_service_scope t2 ON t1.id = t2.service_category_id LEFT JOIN com_convenient_merchants t3 ON t2.merchant_id = t3.id WHERE t3.community_id = #{communityId} AND t3.is_del = 0 GROUP BY t1.id WHERE (t3.community_id = #{communityId} OR t3.community_id = 0) AND t3.is_del = 0 GROUP BY t1.id </select> <select id="getServiceTimesAddPolylineData" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO"> SELECT DATE_FORMAT( t1.statistic_date, '%m' ) AS filed, SUM(t1.consultation_volume) AS num FROM com_convenient_consultation_statistics t1 LEFT JOIN com_convenient_merchants t2 ON t1.merchant_id = t2.id WHERE t2.community_id = #{communityId} AND DATE_FORMAT( t1.statistic_date, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' ) GROUP BY filed WHERE (t2.community_id = #{communityId} OR t2.community_id = 0) AND DATE_FORMAT( t1.statistic_date, '%Y' ) = DATE_FORMAT( CURDATE( ) , '%Y' ) GROUP BY filed </select> <select id="getServiceTimesTotalPolylineDate" resultType="com.panzhihua.common.model.vos.community.StatisticsCommVO"> SELECT IF(SUM(t1.consultation_volume) IS NULL,0,SUM(t1.consultation_volume)) AS num FROM com_convenient_consultation_statistics t1 LEFT JOIN com_convenient_merchants t2 ON t1.merchant_id = t2.id WHERE t2.community_id = #{communityId} AND DATE_FORMAT( t1.statistic_date, '%Y%m' ) <= #{date} WHERE (t2.community_id = #{communityId} OR t2.community_id = 0) AND DATE_FORMAT( t1.statistic_date, '%Y%m' ) <= #{date} </select> <select id="indexMerchantList" resultType="com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO"> SELECT t1.id, t1.`name`, t1.logo, t1.introduction, GROUP_CONCAT(t2.`service_name`) serviceScope FROM com_convenient_merchants t1 LEFT JOIN com_convenient_service_scope t2 ON t1.id = t2.merchant_id WHERE t1.community_id = #{pageBaseDTO.communityId} WHERE (t1.community_id = #{pageBaseDTO.communityId} OR t1.community_id = 0) <if test="pageBaseDTO.paramId != null"> AND t2.service_category_id = #{pageBaseDTO.paramId} </if>
