bugfixed：新增便民服务商家 报错

CeDo

2021-05-07 de91c84954157bb9f8b6d938cbe0b1b51fb6e65d

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

@@ -1,8 +1,11 @@
package com.panzhihua.common.service.partybuilding;

import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
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;
@@ -22,21 +25,59 @@
     * @param partyBuildingMemberVO 党员基本信息
     * @return 新增结果
     */
    @PostMapping("addpartybuildingmember")
    @PostMapping("/partybuildIng/addpartybuildingmember")
    R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);

    /**
     * 平台所有的党组织
     * 社区所有启用的党组织列表
     * @return 党组织集合
     */
    @PostMapping("listpartyorganization")
    List<PartyOrganizationVO> listPartyOrganization();

    @PostMapping("/partybuildIng/listpartyorganization")
    R listPartyOrganization(@RequestParam("communityId") Long communityId);
    /**
     * 社区所有的党组织列表
     * @return 党组织集合
     */
    @PostMapping("/partybuildIng/listpartyorganizationAll")
    R listPartyOrganizationAll(@RequestParam("communityId") Long communityId);
    
    /**
     * 新增党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/addpartyorganization")
    R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    
    /**
     * 编辑党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/updatepartyorganization")
    R updatePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    
    /**
     * 启用，禁用党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/resetpartyorganization")
    R resetPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    
    /**
     * 删除党支部
     * @param partyOrganizationVO 党支部基本信息
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletepartyorganization")
    R deletePartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO);
    
    /**
     * 批量新增党员
     * @param list 党员集合
     */
    @PostMapping("listsavepartybuildingmemberexcelVO")
    @PostMapping("/partybuildIng/listsavepartybuildingmemberexcelvo")
    R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list);

    /**
@@ -44,23 +85,23 @@
     * @param pagePartyOrganizationVO 查询信息
     * @return 分页数据
     */
    @PostMapping("pagepartyorganization")
    @PostMapping("/partybuildIng/pagepartyorganization")
    R pagePartyOrganization(@RequestBody PagePartyOrganizationVO pagePartyOrganizationVO);

    /**
     * 党员活动
     * @param id 党员id
     * @param partyBuildingActivityVO 党员活动查询参数
     * @return 参加的所有活动
     */
    @PostMapping("listpartymemberactivities")
    R listPartyMemberActivities(@RequestParam("id") Integer id);
    @PostMapping("/partybuildIng/listpartymemberactivities")
    R listPartyMemberActivities(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);

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

    /**
@@ -68,7 +109,7 @@
     * @param partyBuildingMemberVO 编辑字段
     * @return 编辑结果
     */
    @PostMapping("updatepartybuildingmember")
    @PostMapping("/partybuildIng/updatepartybuildingmember")
    R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO);

    /**
@@ -76,22 +117,22 @@
     * @param id 活动id
     * @return 活动详情内容
     */
    @PostMapping("activityinfo")
    R activityinfo(@RequestParam("id") Integer id);
    @PostMapping("/partybuildIng/activityinfo")
    R activityinfo(@RequestParam("id") Long id,@RequestParam("userId") Long userId);

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

    /**
     * 社区下拉选择身份
     * @return 身份集合
     */
    @PostMapping("listidentity")
    @PostMapping("/partybuildIng/listidentity")
    R listIdentity();

    /**
@@ -99,21 +140,21 @@
     * @param partyCommitteeVO 新增信息
     * @return 新增结果
     */
    @PostMapping("addpartycommittee")
    @PostMapping("/partybuildIng/addpartycommittee")
    R addPartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
    /**
     * 编辑党委
     * @param partyCommitteeVO 编辑信息
     * @return 编辑结果
     */
    @PostMapping("updatepartycommittee")
    @PostMapping("/partybuildIng/updatepartycommittee")
    R updatePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);
    /**
     * 删除党委
     * @param partyCommitteeVO 删除id
     * @return 删除结果
     */
    @PostMapping("deletepartycommittee")
    @PostMapping("/partybuildIng/deletepartycommittee")
    R deletePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);

    /**
@@ -121,15 +162,15 @@
     * @param partyCommitteeVO 查询参数
     * @return 分页集合
     */
    @PostMapping("pagepartycommittee")
    @PostMapping("/partybuildIng/pagepartycommittee")
    R pagePartyCommittee(@RequestBody PartyCommitteeVO partyCommitteeVO);

    
    /**
     * 新建党建动态
     * @param partyCommitteeVO 动态内容
     * @return 新增结果
     */
    @PostMapping("adddynamic")
    @PostMapping("/partybuildIng/adddynamic")
    R adddYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);

    /**
@@ -137,7 +178,7 @@
     * @param partyCommitteeVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("updatedynamic")
    @PostMapping("/partybuildIng/updatedynamic")
    R updateYnamic(@RequestBody PartyBuildingComPbDynVO partyCommitteeVO);

    /**
@@ -145,15 +186,15 @@
     * @param id 动态主键
     * @return 详情
     */
    @PostMapping("infodynamic")
    R infoYnamic(@RequestParam("id") Integer id);
    @PostMapping("/partybuildIng/infodynamic")
    R infoYnamic(@RequestParam("id") Long id);

    /**
     * 分页查询党员动态/政策文件
     * @param partyBuildingComPbDynVO 查询参数
     * @return 分页数据
     */
    @PostMapping("pagedynamic")
    @PostMapping("/partybuildIng/pagedynamic")
    R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO);

    /**
@@ -161,15 +202,15 @@
     * @param id 动态主键
     * @return 删除结果
     */
    @PostMapping("deletedynamic")
    R deleteYnamic(@RequestParam("id") Integer id);
    @PostMapping("/partybuildIng/deletedynamic")
    R deleteYnamic(@RequestParam("id") Long id);

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

    /**
@@ -177,7 +218,7 @@
     * @param partyBuildingActivityVO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("updateactivity")
    @PostMapping("/partybuildIng/updateactivity")
    R updateActivity(@RequestBody PartyBuildingActivityVO partyBuildingActivityVO);

    /**
@@ -185,23 +226,23 @@
     * @param id 主键id
     * @return 发布结果
     */
    @PostMapping("releaseactivity")
    R releaseActivity(@RequestParam("id") Integer id);
    @PostMapping("/partybuildIng/releaseactivity")
    R releaseActivity(@RequestParam("id") Long id);

    /**
     * 删除党员活动
     * @param id 主键id
     * @return 删除结果
     */
    @PostMapping("deleteactivity")
    R deleteActivity(@RequestParam("id") Integer id);
    @PostMapping("/partybuildIng/deleteactivity")
    R deleteActivity(@RequestParam("id") Long id);

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

    /**
@@ -209,6 +250,161 @@
     * @param comPbDynUserVO 记录内容
     * @return 增加结果
     */
    @PostMapping("adddynuser")
    @PostMapping("/partybuildIng/adddynuser")
    R addDynUser(@RequestBody ComPbDynUserVO comPbDynUserVO);
    /**
     * 删除党员
     * @param id 党员主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deletepartybuildingmember")
    R deleteDynUser(@RequestParam("id") Long id);

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

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

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

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

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

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

    /**
     * 定时任务取消党建活动
     * @return 需要取消的所有党建活动
     */
    @PostMapping("/partybuildIng/timedtaskpartybuildingactivity")
    R timedTaskPartyBuildingActivity();

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

    /**
     * 新增服务团队人员
     * @param comPbServiceTeamDTO 新增内容
     * @return 新增结果
     */
    @PostMapping("/partybuildIng/addserviceteam")
    R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);

    /**
     * 编辑团队人员
     * @param comPbServiceTeamDTO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("/partybuildIng/putserviceteam")
    R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);

    /**
     * 删除服务团队人员
     * @param comPbServiceTeamDTO 删除主键
     * @return 删除结果
     */
    @PostMapping("/partybuildIng/deleteserviceteam")
    R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO);
    /**
     * 分页查询服务团队成员
     * @param pageComPbServiceTeamDTO 查询参数
     * @return 查询结果
     */
    @PostMapping("/partybuildIng/pageserviceteam")
    R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO);

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

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

    /**
     * 查询待认证党员信息
     * @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);
}