springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.interfaces.OperLog; import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto; import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO; import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo; import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO; import com.panzhihua.common.service.community.CommunityService; @@ -297,9 +298,9 @@ @ApiOperation(value = "分页查询注册党员列表",response = PartyBuildingMemberVO.class) @PostMapping("/page/registerMember") public R pageRegisterMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) { partyBuildingMemberVO.setAppid(this.getAppId()); return partyBuildingService.pageRegisterMember(partyBuildingMemberVO); public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) { pageMemberForInviteDTO.setAppid(this.getAppId()); return partyBuildingService.pageRegisterMember(pageMemberForInviteDTO); } @ApiOperation(value = "查询所有社区列表", response = EventGridCommunityAdminVO.class) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageMemberForInviteDTO.java
New file @@ -0,0 +1,35 @@ package com.panzhihua.common.model.dtos.community; import javax.validation.constraints.NotNull; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @title: ActivityInviteDTO * @projectName: * @description: 活动邀请党员请求参数 * @author: hans * @date: 2022/08/02 9:55 */ @Data @ApiModel("活动邀请党员请求参数") public class PageMemberForInviteDTO { @ApiModelProperty("受邀活动id") @NotNull(message = "受邀活动id不能为空") private Long activityId; @ApiModelProperty(value = "报道单位id") private Long checkUnitId; @ApiModelProperty(value = "分页-当前页数", example = "1") private Long pageNum = 1L; @ApiModelProperty(value = "分页-每页记录数", example = "10") private Long pageSize = 10L; @ApiModelProperty(value = "appid", hidden = true) private String appid; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingMemberVO.java
@@ -136,6 +136,4 @@ @ApiModelProperty("微信昵称") private String nickName; @ApiModelProperty(value = "appid", hidden = true) private String appid; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -2,6 +2,7 @@ import java.util.List; import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -623,9 +624,9 @@ /** * 分页查询注册党员列表 * @param partyBuildingMemberVO * @param pageMemberForInviteDTO * @return */ @PostMapping("/partybuildIng/page/registerMember") R pageRegisterMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO); R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -5,6 +5,7 @@ import javax.annotation.Resource; import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; @@ -792,11 +793,11 @@ /** * 分页查询注册党员列表 * @param partyBuildingMemberVO * @param pageMemberForInviteDTO * @return */ @PostMapping("/page/registerMember") public R pageRegisterMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) { return comPbMemberService.pageRegisterMember(partyBuildingMemberVO); public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) { return comPbMemberService.pageRegisterMember(pageMemberForInviteDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -3,6 +3,7 @@ import java.util.List; import java.util.Map; import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO; import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto; import com.panzhihua.common.model.vos.PartyMemberListExcelVO; import com.panzhihua.common.model.vos.partybuilding.*; @@ -203,5 +204,5 @@ * @param dto * @return */ IPage<PartyBuildingMemberVO> pageRegisterMember(@Param("page") Page page, @Param("dto") PartyBuildingMemberVO dto); IPage<PartyBuildingMemberVO> pageRegisterMember(@Param("page") Page page, @Param("dto") PageMemberForInviteDTO dto); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
@@ -3,14 +3,13 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO; import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto; import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo; import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -257,8 +256,8 @@ /** * 分页查询注册党员列表 * @param partyBuildingMemberVO * @param pageMemberForInviteDTO * @return */ R pageRegisterMember(PartyBuildingMemberVO partyBuildingMemberVO); R pageRegisterMember(PageMemberForInviteDTO pageMemberForInviteDTO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -5,26 +5,18 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; import javax.annotation.Resource; import cn.hutool.core.util.IdcardUtil; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.panzhihua.common.enums.ComPbMemberRoleTypeEnum; import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO; import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto; import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto; import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo; import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.service_dangjian.entity.ComPbCheckUnit; import io.swagger.annotations.ApiModelProperty; import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; @@ -32,7 +24,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -43,7 +34,6 @@ import com.panzhihua.common.model.vos.partybuilding.*; import com.panzhihua.common.model.vos.user.SysUserVO; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.RichTextUtil; import com.panzhihua.common.utlis.SensitiveUtil; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_dangjian.dao.*; @@ -1173,7 +1163,7 @@ * @return */ @Override public R pageRegisterMember(PartyBuildingMemberVO dto) { public R pageRegisterMember(PageMemberForInviteDTO dto) { return R.ok(comPbMemberDAO.pageRegisterMember(new Page(dto.getPageNum(), dto.getPageSize()), dto)); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbMemberMapper.xml
@@ -772,7 +772,8 @@ SELECT m.`name`, m.phone, u.user_id FROM com_pb_member m INNER JOIN sys_user u ON m.user_id = u.user_id AND u.type = 1 AND u.app_id = #{dto.appid} WHERE 1=1 LEFT JOIN com_act_activity_invite caai ON m.user_id = caai.user_id AND caai.activity_id = #{dto.activityId} WHERE caai.id IS NULL <if test="dto.checkUnitId != null"> AND m.check_unit_id = #{dto.checkUnitId} </if>
