微心愿详情bug

huanghongfa

2021-01-15 ada9d2e3f734582a0d9ae8c00a936d8c8ed669d7

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

@@ -1,5 +1,6 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
@@ -32,9 +33,9 @@
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
    public List<PartyOrganizationVO> listPartyOrganization(){
        List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.listPartyOrganization();
        return partyOrganizationVOS;
    public R listPartyOrganization(@RequestParam("communityId") Long communityId){
        List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.listPartyOrganization(communityId);
        return R.ok(partyOrganizationVOS);
    }
    /**
     * 新增党员
@@ -43,8 +44,8 @@
     */
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        R r=comPbMemberService.addPartyBuildingMember(partyBuildingMemberVO);
        return r;
        return  comPbMemberService.addPartyBuildingMember(partyBuildingMemberVO);
        
    }

    /**
@@ -53,8 +54,8 @@
     */
    @PostMapping("listsavepartybuildingmemberexcelvo")
    public R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list){
        R r=comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        return r;
        return  comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        
    }

    /**
@@ -64,8 +65,8 @@
     */
    @PostMapping("pagepartyorganization")
    public R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO){
        R r=comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO);
        return r;
        return  comPbMemberService.pagePartyOrganization(pagePartyOrganizationVO);
        
    }

    /**
@@ -79,8 +80,8 @@
        if (ObjectUtils.isEmpty(id)) {
            return R.fail("党员id不能为空");
        }
        R r=comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.listPartyMemberActivities(partyBuildingActivityVO);
        
    }

    /**
@@ -90,8 +91,8 @@
     */
    @PostMapping("pageactivitymembers")
    public R pageActivityMembers(@RequestBody PageActivityMembersVO pageActivityMembersVO){
        R r=comBpActivityService.pageActivityMembers(pageActivityMembersVO);
        return r;
        return  comBpActivityService.pageActivityMembers(pageActivityMembersVO);
        
    }

    /**
@@ -101,8 +102,8 @@
     */
    @PostMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){
        R r=comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO);
        return r;
        return  comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO);
        
    }

    /**
@@ -111,9 +112,9 @@
     * @return 活动详情内容
     */
    @PostMapping("activityinfo")
    public R activityinfo(@RequestParam("id") Long id){
        R r=comBpActivityService.activityinfo(id);
        return r;
    public R activityinfo(@RequestParam("id") Long id,@RequestParam("userId") Long userId){
        return  comBpActivityService.activityinfo(id,userId);
        
    }

    /**
@@ -122,9 +123,9 @@
     * @return 党员列表
     */
    @PostMapping("listPartyMember")
    public R listPartyMember(@RequestParam("communityId")Integer communityId){
        R r=comPbMemberService.listPartyMember(communityId);
        return r;
    public R listPartyMember(@RequestParam("communityId")Long communityId){
        return  comPbMemberService.listPartyMember(communityId);
        
    }

    /**
@@ -134,8 +135,8 @@
     */
    @PostMapping("addpartycommittee")
    public R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.addPartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.addPartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -145,8 +146,8 @@
     */
    @PostMapping("updatepartycommittee")
    public R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.updatePartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.updatePartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -156,8 +157,8 @@
     */
    @PostMapping("deletepartycommittee")
    public R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.deletePartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.deletePartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -167,8 +168,8 @@
     */
    @PostMapping("pagepartycommittee")
    public R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO){
        R r=comPbMemberService.pagePartyCommittee(partyCommitteeVO);
        return r;
        return  comPbMemberService.pagePartyCommittee(partyCommitteeVO);
        
    }

    /**
@@ -178,8 +179,8 @@
     */
    @PostMapping("adddynamic")
    public R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO){
        R r=comPbMemberService.adddYnamic(partyCommitteeVO);
        return r;
        return  comPbMemberService.adddYnamic(partyCommitteeVO);
        
    }

    /**
@@ -189,8 +190,8 @@
     */
    @PostMapping("updatedynamic")
    public R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO){
        R r=comPbMemberService.updateYnamic(partyCommitteeVO);
        return r;
        return  comPbMemberService.updateYnamic(partyCommitteeVO);
        
    }

    /**
@@ -200,8 +201,8 @@
     */
    @PostMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Integer id){
        R r=comPbMemberService.infoYnamic(id);
        return r;
        return  comPbMemberService.infoYnamic(id);
        
    }

    /**
@@ -211,8 +212,8 @@
     */
    @PostMapping("pagedynamic")
    public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
        R r=comPbMemberService.pageYnamic(partyBuildingComPbDynVO);
        return r;
        return  comPbMemberService.pageYnamic(partyBuildingComPbDynVO);
        
    }

    /**
@@ -222,8 +223,8 @@
     */
    @PostMapping("deletedynamic")
    public R deleteYnamic(@RequestParam("id") Integer id){
        R r=comPbMemberService.deleteYnamic(id);
        return r;
        return  comPbMemberService.deleteYnamic(id);
        
    }

    /**
@@ -233,8 +234,8 @@
     */
    @PostMapping("addactivity")
    public R addactivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.addactivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.addactivity(partyBuildingActivityVO);
        
    }

    /**
@@ -244,8 +245,8 @@
     */
    @PostMapping("updateactivity")
    public R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.updateActivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.updateActivity(partyBuildingActivityVO);
        
    }

    /**
@@ -255,8 +256,8 @@
     */
    @PostMapping("releaseactivity")
    public R releaseActivity(@RequestParam("id") Long id){
        R r=comBpActivityService.releaseActivity(id);
        return r;
        return  comBpActivityService.releaseActivity(id);
        
    }

    /**
@@ -266,8 +267,8 @@
     */
    @PostMapping("deleteactivity")
    public R deleteActivity(@RequestParam("id") Long id){
        R r=comBpActivityService.deleteActivity(id);
        return r;
        return  comBpActivityService.deleteActivity(id);
        
    }

    /**
@@ -277,8 +278,8 @@
     */
    @PostMapping("pageactivity")
    public R pageActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.pageActivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.pageActivity(partyBuildingActivityVO);
        
    }

    /**
@@ -288,8 +289,8 @@
     */
    @PostMapping("adddynuser")
    public R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO){
        R r=comPbMemberService.addDynUser(comPbDynUserVO);
        return r;
        return  comPbMemberService.addDynUser(comPbDynUserVO);
        
    }

    /**
@@ -299,8 +300,8 @@
     */
    @PostMapping("deletepartybuildingmember")
    public R deleteDynUser(@RequestParam("id") Integer id){
        R r=comPbMemberService.deleteDynUser(id);
        return r;
        return  comPbMemberService.deleteDynUser(id);
        
    }

    /**
@@ -310,8 +311,76 @@
     */
    @PostMapping("cancelactivity")
    public R cancelActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO){
        R r=comBpActivityService.cancelActivity(partyBuildingActivityVO);
        return r;
        return  comBpActivityService.cancelActivity(partyBuildingActivityVO);
        
    }

    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @return  党建活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId){
        return  comBpActivityService.listActivity(userId);
        
    }

    /**
     * 党员活动人员参入列表
     * @param id 活动id
     * @return 党员集合
     */
    @PostMapping("listpartybuildingmember")
    public R listPartyBuildingMember(@RequestParam("id")Long id){
        return  comBpActivityService.listPartyBuildingMember(id);
    }

    /**
     * 报名、取消报名党员活动
     * @param activitySignUpDTO 操作参数
     * @return 操作结果
     */
    @PostMapping("putactivitysignup")
    public R putActivitySignUp(@RequestBody ActivitySignUpDTO activitySignUpDTO){
        return  comBpActivityService.putActivitySignUp(activitySignUpDTO);
    }

    /**
     * 获取党建活动所有参入人员的id集合
     * @param id 党建活动id
     * @return 人员id集合
     */
    @PostMapping("selectallpartybuildingactivitymembers")
    public R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id){
        return  comBpActivityService.selectAllPartyBuildingActivityMembers(id);
    }

    /**
     * 定时任务刷新党建动态发布状态
     * @return 刷新数据数量
     */
    @PostMapping("timedtaskpartybuildingstatus")
    R timedTaskPartyBuildingStatus(){
        return  comPbMemberService.timedTaskPartyBuildingStatus();
    }

    /**
     * 定时任务取消党建活动
     * @return 党建活动集合
     */
    @PostMapping("timedtaskpartybuildingactivity")
    public R timedTaskPartyBuildingActivity(){
        return comBpActivityService.timedTaskPartyBuildingActivity();
}

    /**
     * 定时任务刷新党建活动的各个状态 除取消外
     * @return  修改结果
     */
    @PostMapping("timedtaskpartybuildingactivityall")
    public R timedTaskPartyBuildingActivityAll(){
        return comBpActivityService.timedTaskPartyBuildingActivityAll();
    }

}