springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/ComActReserveListAdminVO.java
@@ -55,4 +55,7 @@ @ApiModelProperty("是否是首页应用（1.是 2.否）") private Integer adverPositionApplication; @ApiModelProperty("社区名称") private String communityName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -4917,6 +4917,14 @@ R getCommunityLists(); /** * 查询西区社区列表 * * @return 社区列表 */ @GetMapping("/eventgrid/community/westList") R getWestCommunityLists(); /** * 分页查询退役军人列表 * * @param comExServicemanDTO springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -723,6 +723,11 @@ public R getCommunityLists() { return communityService.getCommunityLists(); } @ApiOperation(value = "查询西区社区列表") @GetMapping("community/westList") public R getWestCommunityLists() { return communityService.getWestCommunityLists(); } @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class) @GetMapping("easyphoto") springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -2288,6 +2288,16 @@ } /** * 查询西区社区列表 * * @return 社区列表 */ @GetMapping("/eventgrid/community/westList") public R getWestCommunityLists() { return comActService.getWestCommunityLists(); } /** * 随手拍发放奖励 * * @param grantRewardDTO springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDAO.java
@@ -87,4 +87,7 @@ + "FROM " + " com_act c " + " left join com_street as cs on cs.street_id = c.street_id " + " HAVING distance >= 0 and distance <= #{communityDTO.distance} " + "ORDER BY " + " distance ASC") List<CommunitySwitchAllAppletsVO> getCommunityListByNearby(@Param("communityDTO") SearchCommunityDTO communityDTO); @Select("select t.community_id,t.`name` from com_act t left join com_street t1 on t.street_id = t1.street_id where t.state = 0 and t1.street_id in (12,14,15,16,17,18)") List<EventGridCommunityAdminVO> getWestCommunityLists(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActService.java
@@ -81,6 +81,13 @@ R getCommunityLists(); /** * 查询西区社区列表 * * @return 社区列表 */ R getWestCommunityLists(); /** * 查询社区所有列表 * * @return 社区列表 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -219,6 +219,11 @@ return R.ok(this.comActDAO.getCommunityLists()); } @Override public R getWestCommunityLists() { return R.ok(this.comActDAO.getWestCommunityLists()); } /** * 查询社区所有列表 * springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml
@@ -57,35 +57,39 @@ <select id="pageReserveAdmin" parameterType="com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO" resultType="com.panzhihua.common.model.vos.community.reserve.ComActReserveListAdminVO"> SELECT id, community_id, `type`, title, SELECT t.id, t.community_id, t.`type`, t.title, view_num, join_all_count, join_count, `status`, t.`status`, publish_time, create_at, t.create_at, end_time, adver_position_top, adver_position_application FROM com_act_reserve adver_position_application, t1.`name` as community_name FROM com_act_reserve t left join com_act t1 on t.community_id = t1.community_id <where> and is_del = 2 and t.is_del = 2 <if test="pageReserveDTO.communityId != null and pageReserveDTO.communityId !=0"> and community_id = #{pageReserveDTO.communityId} and t.community_id = #{pageReserveDTO.communityId} </if> <if test="pageReserveDTO.communityId ==0"> and t1.street_id in (12,14,15,16,17,18) </if> <if test="pageReserveDTO.type != null and pageReserveDTO.type.size > 0"> and `type` in and t.`type` in <foreach collection='pageReserveDTO.type' item='id' index='index' open='(' close=')' separator=',' > #{id} </foreach> </if> <if test="pageReserveDTO.status != null"> and status = #{pageReserveDTO.status} and t.status = #{pageReserveDTO.status} </if> <if test="pageReserveDTO.advertType != null and pageReserveDTO.advertType == 1"> and adver_position_top = 2 and adver_position_application = 2 @@ -100,13 +104,13 @@ and title like concat (#{pageReserveDTO.keyWord},'%') </if> <if test="pageReserveDTO.startTime != null and pageReserveDTO.startTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{pageReserveDTO.startTime} AND DATE_FORMAT(t.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{pageReserveDTO.startTime} </if> <if test="pageReserveDTO.endTime != null and pageReserveDTO.endTime != """> AND DATE_FORMAT(create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{pageReserveDTO.endTime} AND DATE_FORMAT(t.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{pageReserveDTO.endTime} </if> </where> order by create_at desc order by t.create_at desc </select> <delete id="deleteReserveSubAll">
