Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2023-08-23 ed35e27fd377db24fd5ff83848824f6525f1382c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -11312,6 +11312,15 @@
    R volunteerDeleteById(@RequestParam("id") String id);



    /**
     * 定时刷新活动状态
     * @return
     */
    @GetMapping("/Volunteer/timedTaskVolunteerActivitiesJobHandler")
    public R  timedTaskVolunteerActivitiesJobHandler();


    /*******************************************************************************************************************
     *
     *
@@ -11353,6 +11362,63 @@
    @DeleteMapping("/VolunteerType/volunteerTypeDelete")
    public R volunteerTypeDelete(@RequestParam("id") String id);

    /*****************************************************************************************************************
     *
     *
     *                                      志愿者参加活动
     *
     *
     ****************************************************************************************************************/
    /**
     * 志愿者单个详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerActivitiesPeople/vapGetById")
    public R vapGetById(@RequestParam("id") String id);

    /**
     * 参与人员列表
     * @param activityId
     * @param communityId
     * @return
     */
    @GetMapping("/VolunteerActivitiesPeople/vapGetList")
    public R  vapGetList(@RequestParam("activityId") String activityId,
                         @RequestParam("communityId") String communityId);

    /**
     * 添加参与人员
     * @param volunteerActivitiesPeopleVO
     * @return
     */
    @PostMapping("/VolunteerActivitiesPeople/vapInsert")
    public R  vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

    /**
     * 修改参与人员
     * @param volunteerActivitiesPeopleVO
     * @return
     */
    @PostMapping("/VolunteerActivitiesPeople/vapUpdate")
    public R  vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);

    /**
     * 删除参与人员
     * @param id
     * @return
     */
    @DeleteMapping("/VolunteerActivitiesPeople/vapDelete")
    public R vapDelete(@RequestParam("id") String id);


    /**
     * 志愿者活动  奖励发放
     * @param grantIntegral
     * @return
     */
    @PostMapping("/grantIntegral")
    public R grantIntegral(@RequestBody GrantIntegral grantIntegral);