bug修改

101captain

2022-07-15 4ada4733bfded6398387103e64d01a1ecc0407e8

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngWestApi.java

@@ -5,7 +5,7 @@

import javax.annotation.Resource;

import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.common.model.vos.partybuilding.west.*;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
@@ -193,35 +193,35 @@

    }

    /**
     * 党员活动查询
     *
     * @param partyBuildingActivityVO
     *            查询参数
     * @return 参加的所有活动
     */
    @PostMapping("listpartymemberactivities")
    public R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        Long id = partyBuildingActivityVO.getId();
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("党员id不能为空");
        }
        return comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
//    /**
//     * 党员活动查询
//     *
//     * @param partyBuildingActivityVO
//     *            查询参数
//     * @return 参加的所有活动
//     */
//    @PostMapping("listpartymemberactivities")
//    public R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        Long id = partyBuildingActivityVO.getId();
//        if (ObjectUtils.isEmpty(id)) {
//            return R.fail("党员id不能为空");
//        }
//        return comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
//
//    }

    }

    /**
     * 活动报名名单分页查询
     *
     * @param pageActivityMembersVO
     *            查询参数 手机号 名字
     * @return 分页数据
     */
    @PostMapping("pageactivitymembers")
    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO) {
        return comBpActivityService.pageActivityMembers(pageActivityMembersVO);

    }
//    /**
//     * 活动报名名单分页查询
//     *
//     * @param pageActivityMembersVO
//     *            查询参数 手机号 名字
//     * @return 分页数据
//     */
//    @PostMapping("pageactivitymembers")
//    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO) {
//        return comBpActivityService.pageActivityMembers(pageActivityMembersVO);
//
//    }

    /**
     * 编辑党员信息 新增字段均可编辑
@@ -378,31 +378,31 @@

    }

    /**
     * 新增党员活动
     *
     * @param partyBuildingActivityVO
     *            参数
     * @return 新增结果
     */
    @PostMapping("addactivity")
    public R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.addactivity(partyBuildingActivityVO);
//    /**
//     * 新增党员活动
//     *
//     * @param partyBuildingActivityVO
//     *            参数
//     * @return 新增结果
//     */
//    @PostMapping("addactivity")
//    public R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.addactivity(partyBuildingActivityVO);
//
//    }

    }

    /**
     * 编辑党员活动
     *
     * @param partyBuildingActivityVO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("updateactivity")
    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.updateActivity(partyBuildingActivityVO);

    }
//    /**
//     * 编辑党员活动
//     *
//     * @param partyBuildingActivityVO
//     *            编辑内容
//     * @return 编辑结果
//     */
//    @PostMapping("updateactivity")
//    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.updateActivity(partyBuildingActivityVO);
//
//    }

    /**
     * 发布党员活动
@@ -430,18 +430,18 @@

    }

    /**
     * 分页查询党员活动
     *
     * @param partyBuildingActivityVO
     *            查询条件
     * @return 查询结果
     */
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.pageActivity(partyBuildingActivityVO);

    }
//    /**
//     * 分页查询党员活动
//     *
//     * @param partyBuildingActivityVO
//     *            查询条件
//     * @return 查询结果
//     */
//    @PostMapping("pageactivity")
//    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.pageActivity(partyBuildingActivityVO);
//
//    }

    /**
     * 增加阅读记录
@@ -469,18 +469,18 @@

    }

    /**
     * 取消活动
     *
     * @param partyBuildingActivityVO
     *            取消原因
     * @return 操作结果
     */
    @PostMapping("cancelactivity")
    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
        return comBpActivityService.cancelActivity(partyBuildingActivityVO);

    }
//    /**
//     * 取消活动
//     *
//     * @param partyBuildingActivityVO
//     *            取消原因
//     * @return 操作结果
//     */
//    @PostMapping("cancelactivity")
//    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO) {
//        return comBpActivityService.cancelActivity(partyBuildingActivityVO);
//
//    }

    /**
     * 用户的所有党建活动