bug修改

puhanshu

2022-07-23 bbda2ee1af4e86d76f93e00386d77efb56c60d5f

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

@@ -1,19 +1,17 @@
package com.panzhihua.common.service.partybuilding;

import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
import java.util.List;

import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,11 +19,13 @@
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2020-11-30 09:50
 **/
@FeignClient(value = "partybuilding")
@FeignClient(value =  "huacheng-partybuilding")
public interface PartyBuildingService {
    /**
     * 新增党员
     * @param partyBuildingMemberVO 党员基本信息
     *
     * @param partyBuildingMemberVO
     *            党员基本信息
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/addpartybuildingmember")
@@ -33,67 +33,102 @@

    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIng/listpartyorganization")
    R listPartyOrganization(@RequestParam("communityId") Long communityId);

    /**
     * 社区所有的党组织列表
     * 分页查询所有的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIng/listpartyorganizationAll")
    R listPartyOrganizationAll(@RequestParam("communityId") Long communityId);
    
    R listPartyOrganizationAll(@RequestBody PartyOrganizationVO partyOrganizationVO);

    /**
     * 查询所有党组织列表
     * @param partyOrganizationVO   请求参数
     * @return  党组织列表
     */
    @PostMapping("/partybuildIng/getPbOrgAllList")
    R getPbOrgAllList(@RequestBody PartyOrganizationVO partyOrganizationVO);

    /**
     * 新增党支部
     * @param partyOrganizationVO 党支部基本信息
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/addpartyorganization")
    R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    

    /**
     * 编辑党支部
     * @param partyOrganizationVO 党支部基本信息
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/updatepartyorganization")
    R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    

    /**
     * 启用，禁用党支部
     * @param partyOrganizationVO 党支部基本信息
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/resetpartyorganization")
    R resetPartyOrganization(PartyOrganizationVO partyOrganizationVO);
    
    R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);

    /**
     * 删除党支部
     * @param partyOrganizationVO 党支部基本信息
     *
     * @param partyOrganizationVO
     *            党支部基本信息
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletepartyorganization")
    R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO);
    
    R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);

    /**
     * 批量新增党员
     * @param list 党员集合
     *
     * @param list
     *            党员集合
     */
    @PostMapping("/partybuildIng/listsavepartybuildingmemberexcelvo")
    R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list);

    /**
     * 分页查询党员信息
     * @param pagePartyOrganizationVO 查询信息
     *
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
     */
    @PostMapping("/partybuildIng/pagepartyorganization")
    R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);

    /**
     * 导出党员信息
     *
     * @param pagePartyOrganizationVO
     *            查询信息
     * @return 分页数据
     */
    @PostMapping("/partybuildIng/exportPartyMember")
    R exportPartyMember(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);

    /**
     * 党员活动
     * @param partyBuildingActivityVO 党员活动查询参数
     *
     * @param partyBuildingActivityVO
     *            党员活动查询参数
     * @return 参加的所有活动
     */
    @PostMapping("/partybuildIng/listpartymemberactivities")
@@ -101,7 +136,9 @@

    /**
     * 活动报名名单分页查询
     * @param pageActivityMembersVO 查询参数 手机号 名字
     *
     * @param pageActivityMembersVO
     *            查询参数 手机号 名字
     * @return 分页数据
     */
    @PostMapping("/partybuildIng/pageactivitymembers")
@@ -109,7 +146,9 @@

    /**
     * 编辑党员信息 新增字段均可编辑
     * @param partyBuildingMemberVO 编辑字段
     *
     * @param partyBuildingMemberVO
     *            编辑字段
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/updatepartybuildingmember")
@@ -117,22 +156,27 @@

    /**
     * 党员活动详情
     * @param id 活动id
     *
     * @param id
     *            活动id
     * @return 活动详情内容
     */
    @PostMapping("/partybuildIng/activityinfo")
    R activityinfo(@RequestParam("id") Long id,@RequestParam("userId") Long userId);
    R activityinfo(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 查询指定社区的所有党员
     * @param communityId 社区id
     *
     * @param communityId
     *            社区id
     * @return 党员列表
     */
    @PostMapping("/partybuildIng/listPartyMember")
    R listPartyMember(@RequestParam("communityId")Long communityId);
    R listPartyMember(@RequestParam("communityId") Long communityId);

    /**
     * 社区下拉选择身份
     *
     * @return 身份集合
     */
    @PostMapping("/partybuildIng/listidentity")
@@ -140,21 +184,29 @@

    /**
     * 新增党委
     * @param partyCommitteeVO 新增信息
     *
     * @param partyCommitteeVO
     *            新增信息
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/addpartycommittee")
    R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);

    /**
     * 编辑党委
     * @param partyCommitteeVO 编辑信息
     *
     * @param partyCommitteeVO
     *            编辑信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/updatepartycommittee")
    R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);

    /**
     * 删除党委
     * @param partyCommitteeVO 删除id
     *
     * @param partyCommitteeVO
     *            删除id
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletepartycommittee")
@@ -162,15 +214,19 @@

    /**
     * 分页社区党委查询
     * @param partyCommitteeVO 查询参数
     *
     * @param partyCommitteeVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("/partybuildIng/pagepartycommittee")
    R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
    

    /**
     * 新建党建动态
     * @param partyCommitteeVO 动态内容
     *
     * @param partyCommitteeVO
     *            动态内容
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/adddynamic")
@@ -178,7 +234,9 @@

    /**
     * 编辑动态
     * @param partyCommitteeVO 编辑内容
     *
     * @param partyCommitteeVO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/updatedynamic")
@@ -186,7 +244,9 @@

    /**
     * 动态详情
     * @param id 动态主键
     *
     * @param id
     *            动态主键
     * @return 详情
     */
    @PostMapping("/partybuildIng/infodynamic")
@@ -194,7 +254,9 @@

    /**
     * 分页查询党员动态/政策文件
     * @param partyBuildingComPbDynVO 查询参数
     *
     * @param partyBuildingComPbDynVO
     *            查询参数
     * @return 分页数据
     */
    @PostMapping("/partybuildIng/pagedynamic")
@@ -202,7 +264,9 @@

    /**
     * 删除动态
     * @param id 动态主键
     *
     * @param id
     *            动态主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletedynamic")
@@ -210,7 +274,9 @@

    /**
     * 新增党员活动
     * @param partyBuildingActivityVO 参数
     *
     * @param partyBuildingActivityVO
     *            参数
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/addactivity")
@@ -218,7 +284,9 @@

    /**
     * 编辑党员活动
     * @param partyBuildingActivityVO 编辑内容
     *
     * @param partyBuildingActivityVO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/updateactivity")
@@ -226,7 +294,9 @@

    /**
     * 发布党员活动
     * @param id 主键id
     *
     * @param id
     *            主键id
     * @return 发布结果
     */
    @PostMapping("/partybuildIng/releaseactivity")
@@ -234,7 +304,9 @@

    /**
     * 删除党员活动
     * @param id 主键id
     *
     * @param id
     *            主键id
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deleteactivity")
@@ -242,7 +314,9 @@

    /**
     * 分页查询党员活动
     * @param partyBuildingActivityVO 查询条件
     *
     * @param partyBuildingActivityVO
     *            查询条件
     * @return 查询结果
     */
    @PostMapping("/partybuildIng/pageactivity")
@@ -250,14 +324,19 @@

    /**
     * 增加阅读记录
     * @param comPbDynUserVO 记录内容
     *
     * @param comPbDynUserVO
     *            记录内容
     * @return 增加结果
     */
    @PostMapping("/partybuildIng/adddynuser")
    R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO);

    /**
     * 删除党员
     * @param id 党员主键
     *
     * @param id
     *            党员主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletepartybuildingmember")
@@ -265,7 +344,9 @@

    /**
     * 取消活动
     * @param partyBuildingActivityVO 取消原因
     *
     * @param partyBuildingActivityVO
     *            取消原因
     * @return 操作结果
     */
    @PostMapping("/partybuildIng/cancelactivity")
@@ -273,24 +354,33 @@

    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @param communityId 社区id  同一用户在不同社区都是党员
     * @return  党建活动列表
     *
     * @param userId
     *            用户id
     * @param communityId
     *            社区id 同一用户在不同社区都是党员
     * @param status
     * @return 党建活动列表
     */
    @PostMapping("/partybuildIng/listactivity")
    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId")Long communityId);
    R listActivity(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId,
                   @RequestParam(value = "status", required = false) Integer status);

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

    /**
     * 报名、取消报名党员活动
     * @param activitySignUpDTO 操作参数
     *
     * @param activitySignUpDTO
     *            操作参数
     * @return 操作结果
     */
    @PostMapping("/partybuildIng/putactivitysignup")
@@ -298,14 +388,17 @@

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

    /**
     * 定时任务刷新党建动态发布状态
     *
     * @return 刷新数据数量
     */
    @PostMapping("/partybuildIng/timedtaskpartybuildingstatus")
@@ -313,6 +406,7 @@

    /**
     * 定时任务取消党建活动
     *
     * @return 需要取消的所有党建活动
     */
    @PostMapping("/partybuildIng/timedtaskpartybuildingactivity")
@@ -320,14 +414,17 @@

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

    /**
     * 新增服务团队人员
     * @param comPbServiceTeamDTO 新增内容
     *
     * @param comPbServiceTeamDTO
     *            新增内容
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/addserviceteam")
@@ -335,7 +432,9 @@

    /**
     * 编辑团队人员
     * @param comPbServiceTeamDTO 编辑内容
     *
     * @param comPbServiceTeamDTO
     *            编辑内容
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/putserviceteam")
@@ -343,14 +442,19 @@

    /**
     * 删除服务团队人员
     * @param comPbServiceTeamDTO 删除主键
     *
     * @param comPbServiceTeamDTO
     *            删除主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deleteserviceteam")
    R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);

    /**
     * 分页查询服务团队成员
     * @param pageComPbServiceTeamDTO 查询参数
     *
     * @param pageComPbServiceTeamDTO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("/partybuildIng/pageserviceteam")
@@ -358,13 +462,162 @@

    /**
     * 创建党员活动 小程序创建党员活动
     * @param comPbActivityDTO 创建内容
     *
     * @param comPbActivityDTO
     *            创建内容
     * @return 创建结果
     */
    @PostMapping("/partybuildIng/addactivityinfo")
    R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO);

	
    /**
     * 查询用户党员认证信息
     *
     * @param id
     * @param communityId
     *            用户ID
     * @return 查询结果
     */
    @GetMapping("/partybuildIng/usercertification")
    R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId);

	
    /**
     * 查询待认证党员信息
     *
     * @param pagePartyBuildingMemberVO
     *            查询参数
     * @return 查询结果
     */
    @PostMapping("/partybuildIng/pageusercertification")
    R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO);

    /**
     * 根据身份证号码查询党员信息
     *
     * @param idCard
     *            身份证号码
     * @return 党员信息
     */
    @PostMapping("/partybuildIng/getPartyBuildingByIdCard")
    R getPartyBuildingByIdCard(@RequestParam("idCard") String idCard);

    /**
     * 社区所有启用的党组织列表
     *
     * @return 党组织集合
     */
    @PostMapping("/partybuildIng/listpartyorganizationByApp")
    R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO);

    /**
     * 根据id删除党员认证
     *
     * @param id
     *            党员认证id
     * @return 党员认证id
     */
    @PostMapping("/partybuildIng/deleteprepartybuildingmember")
    R deleteprepartybuildingmember(@RequestParam("id") Long id);

    /**
     * 导出党员信息
     *
     * @param organizationVO
     *            请求参数
     * @return 党员信息列表
     */
    @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);

    /**
     * 分页查询党员数据统计
     * @param statisticsMemberDto   请求参数
     * @return  党员数据统计
     */
    @PostMapping("/partybuildIng/pageDataStatisticsMember")
    R pageDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 根据组织id查询组织下统计数据
     * @param statisticsOrgDto  请求参数
     * @return  组织下统计数据
     */
    @PostMapping("/partybuildIng/getOrgDataStatistics")
    R getOrgDataStatistics(@RequestBody ComDataStatisticsOrgDto statisticsOrgDto);

    /**
     * 查询党组织表头统计数据
     * @param communityId
     *            社区id
     * @return  党组织表头统计数据
     */
    @GetMapping("/partybuildIng/getHeaderOrgDataStatistics")
    R getHeaderOrgDataStatistics(@RequestParam("communityId") Long communityId);

    /**
     * 党员数据统计-党员导出数据查询
     * @param statisticsMemberDto   请求参数
     * @return  党员导出数据
     */
    @PostMapping("/partybuildIng/exportDataStatisticsMember")
    R exportDataStatisticsMember(@RequestBody PageComDataStatisticsMemberDto statisticsMemberDto);

    /**
     * 党委导入接口
     * @param memberRoleExcelVoList 数据列表
     * @param communityId   社区id
     * @param userId    用户id
     * @return  导入结果
     */
    @PostMapping("/partybuildIng/importPbMemberRole")
    R importPbMemberRole(@RequestBody List<ComPbMemberRoleExcelVo> memberRoleExcelVoList,@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId);

    /**
     * 身份证查询是否党员
     * @param idCard
     * @return
     */
    @GetMapping("/partybuildIng/checkMember")
    R checkMember(@RequestParam("idCard")String idCard);

    /**
     * 小程序分页查询党员列表
     * @param partyBuildingMemberVO 请求参数
     * @return  党员列表
     */
    @PostMapping("/partybuildIng/getPagePbMember")
    R getPagePbMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);


    @GetMapping("/partybuildIng/getPartyMember")
    public R getPartyMember(@RequestParam("phone")String phone,@RequestParam("type")Integer type);

    @GetMapping("/partybuildIng/memberDetail")
    public R memberDetail(@RequestParam("id")Long id);

    @GetMapping("/comPbCheckUnit/detailByPhone")
    public R detailByPhone(@RequestParam("phone") String phone);
}