springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11830,7 +11830,7 @@ * 报名参数 * @return 报名 取消报名 结果 */ @PostMapping("jinhuiSignActivity") @PostMapping("/jinhui/jinhuiSignActivity") public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO); @@ -11841,7 +11841,7 @@ * @param comActActRegistVO 签到参数 * @return 签到结果 */ @PostMapping("jinhuiActivitySignIn") @PostMapping("/jinhui/jinhuiActivitySignIn") public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -2824,34 +2824,4 @@ return comActEasyPhotoService.selectStatisticsPhoto(); } /** * 报名/取消报名社区活动 * 金汇社区专用 * @param signactivityVO * 报名参数 * @return 报名 取消报名 结果 */ @PostMapping("jinhuiSignActivity") public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO) { return comActActivityService.jinhuiSignActivity(signactivityVO); } /** * 用户签到 * 金汇社区专用 * @param comActActRegistVO 签到参数 * @return 签到结果 */ @PostMapping("jinhuiActivitySignIn") public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) { return comActActivityService.jinhuiActivitySignIn(comActActRegistVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/jinhuiApi.java
New file @@ -0,0 +1,60 @@ package com.panzhihua.service_community.api; import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO; import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO; import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActActRegistVO; import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.service_community.service.ComActActivityService; import com.panzhihua.service_community.service.ComActDpcService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; /** * @title: ComActDpcApi * @projectName: 成都呐喊信息技术有限公司-智慧社区项目 * @description: 金汇社区 * @author: hans * @date: 2022/06/07 10:57 */ @Slf4j @RestController @RequestMapping("/jinhui") public class jinhuiApi { @Resource private ComActActivityService comActActivityService; /** * 报名/取消报名社区活动 * 金汇社区专用 * @param signactivityVO * 报名参数 * @return 报名 取消报名 结果 */ @PostMapping("jinhuiSignActivity") public R jinhuiSignActivity(@RequestBody SignactivityVO signactivityVO) { return comActActivityService.jinhuiSignActivity(signactivityVO); } /** * 用户签到 * 金汇社区专用 * @param comActActRegistVO 签到参数 * @return 签到结果 */ @PostMapping("jinhuiActivitySignIn") public R jinhuiActivitySignIn(@RequestBody ComActActRegistVO comActActRegistVO) { return comActActivityService.jinhuiActivitySignIn(comActActRegistVO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
@@ -399,6 +399,11 @@ LEFT JOIN com_act ca ON a.community_id = ca.community_id JOIN (SELECT * FROM com_act_social_project WHERE (street_id = #{comActActivityVO.streetId} OR community_id = #{comActActivityVO.communityId})) t ON a.project_id = t.id <where> <if test="comActActivityVO.aattendPeople != null and comActActivityVO.aattendPeople != '' "> AND a.aattend_people = #{comActActivityVO.aattendPeople} </if> </where> GROUP BY a.id ORDER BY a.status = 99 desc,a.publish_at DESC </select> @@ -478,6 +483,9 @@ <if test="comActActivityVO.type != null"> AND a.type = #{comActActivityVO.type} </if> <if test="comActActivityVO.aattendPeople != null and comActActivityVO.aattendPeople != '' "> AND a.aattend_people = #{comActActivityVO.aattendPeople} </if> GROUP BY a.id ORDER BY a.status = 99 DESC,a.publish_at DESC </select> springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideClassifyMapper.xml
@@ -25,7 +25,7 @@ create_at, community_id, sys_flag from com_act_work_guide_classify from jinhui_com_act_work_guide_classify <where> <if test="comActWorkGuideClassifyVO.classifyName != null and comActWorkGuideClassifyVO.classifyName !=''"> AND classify_name like concat ('%', #{comActWorkGuideClassifyVO.classifyName}, '%') @@ -40,7 +40,7 @@ <select id="listWorkGuideClassify" resultType="com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO"> SELECT cawgc.id, cawgc.classify_name, cawgc.picture_url,( SELECT count( id ) FROM com_act_work_guide WHERE classify = cawgc.id ) AS `count` FROM com_act_work_guide_classify AS cawgc jinhui_com_act_work_guide_classify AS cawgc <where> <if test="areaCode!=null"> and cawgc.area_code = #{area_code} springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComActWorkGuideMapper.xml
@@ -40,7 +40,7 @@ phone, create_at, community_id from com_act_work_guide from jinhui_com_act_work_guide <where> <if test='pageActWorkGuideDTO.classify != null'> and classify = #{pageActWorkGuideDTO.classify} @@ -66,7 +66,7 @@ phone, create_at, community_id from com_act_work_guide from jinhui_com_act_work_guide where classify = #{classifyId} order by create_at desc <if test="pageSize != null">