Merge branch 'txb'

tangxiaobao

2021-08-13 8a6375edade9f1edc194a0381369fe94e56c13c7

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java

@@ -4,6 +4,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -407,4 +408,22 @@
     */
    @PostMapping("/partybuildIng/exportPbMember")
    R exportPbMember(@RequestBody PagePartyOrganizationVO organizationVO);


    /**
     * 选择人员
     * @param param 查询条件
     * @param communityId 社区id
     * @return 查询结果
     */
    @PostMapping("/partybuildIng/getTotlePerson")
    R getTotlePerson(@RequestParam(value = "param", required = false)String param, @RequestParam(value = "communityId") Long communityId);

    /**
     * 根据党员活动id查询活动下报名人员
     * @param activityId    党员活动id
     * @return  活动下报名人员
     */
    @PostMapping("/partybuildIng/getTaskPbActivityPeopleList")
    R getTaskPbActivityPeopleList(@RequestParam("activityId") Long activityId);
}