Merge branch 'test' into 'master'

罗yu 元桥

2021-05-07 6c4db89ea8795d6be8431f698051e62bec9ec956

Merge branch 'test' into 'master'

Test

See merge request root/zhihuishequ!8

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java

@@ -37,6 +37,11 @@
            return R.fail("请先绑定社区");
        }
        neighborCircleAppDTO.setCommunityId(communityId);

        Long userId = this.getLoginUserInfo().getUserId();
        if(userId != null){
            neighborCircleAppDTO.setUserId(userId);
        }
        return communityService.pageNeighborByApp(neighborCircleAppDTO);
    }

@@ -61,6 +66,11 @@
    @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
    @PostMapping("detail")
    public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if(userId == null){
            return R.fail("请先登录");
        }
        neighborCircleAppDTO.setUserId(userId);
        return communityService.neighborDetailByApp(neighborCircleAppDTO);
    }


 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -4,6 +4,7 @@
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -198,6 +199,17 @@
        return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
    }

    @ApiOperation(value = "社区所有启用的党组织列表", response = PartyOrganizationVO.class)
    @PostMapping("listpartyorganization")
    public R listPartyOrganization(@RequestBody ComListPartyDTO comListPartyDTO) {
        Long communityId = this.getCommunityId();
        log.info("社区所有党组织社区id【{}】", communityId);
        if(communityId != null){
            comListPartyDTO.setCommunityId(communityId);
        }
        return partyBuildingService.listPartyOrganizationByApp(comListPartyDTO);
    }

    public static void main(String[] args) {
        Date date = new Date();
        String dateFormat = String.format("%tF %tT ", date, date);

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -328,7 +328,7 @@
    @ApiOperation(value = "党员认证")
    @PostMapping("partybuildingembercertification")
    public R partybuildingembercertification(@RequestBody @Validated(AddGroup.class) ComPbMemberCertificationDTO comPbMemberCertificationDTO) {
        //totest 党员认证
        //党员认证
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        Long communityId = loginUserInfo.getCommunityId();
@@ -342,13 +342,15 @@
        Object certUserInfo = certUser.getData();
        boolean userCertified = false;
        if (certUserInfo != null) {
            PartyBuildingMemberVO certUserVo = (PartyBuildingMemberVO) certUserInfo;
            //已认证党员身份，直接返回
            userCertified = certUserVo.getAuditResult() == 1;
            try {
                PartyBuildingMemberVO certUserVo = JSONObject.parseObject(JSONObject.toJSONString(certUser.getData()), PartyBuildingMemberVO.class);
                //已认证党员身份，直接返回
                userCertified = certUserVo.getAuditResult() == 1;
            }catch (Exception e){}
        }
        //匹配手机，验证是否进行自动确认
        if (userCertified) {
            return R.fail("用户已完成党员认证");
            return R.fail("您已审核通过，无需重复提交");
        }

        PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
@@ -373,7 +375,7 @@
    @ApiOperation(value = "党员认证查询")
    @GetMapping("partybuildingembercertification")
    public R partybuildingembercertification() {
        //totest 党员认证查询
        //党员认证查询
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        return partyBuildingService.userCertification(userId);

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComListPartyDTO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.dtos.partybuilding;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 查询党组织列表请求参数
 * @author: huang.hongfa weixin hhf9596 qq 959656820
 * @create: 2021-01-21 18:05
 **/
@Data
@ApiModel("查询党组织列表请求参数")
public class ComListPartyDTO {

    @ApiModelProperty("姓名")
    private String name;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMessageBackVO.java

@@ -50,6 +50,9 @@
    @ApiModelProperty(value = "回复人姓名",hidden = true)
    private String userName;

    @ApiModelProperty(value = "回复人职位")
    private String userJob;

    @ApiModelProperty(value = "社区主键",hidden = true)
    private Long communityId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java

@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.neighbor;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -46,6 +47,7 @@
    private Integer isBoutique;

    @ApiModelProperty("发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("最后回复时间")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -2386,7 +2386,7 @@
     * 邻里圈评论回复_基本详情
     * @param id 参数
     */
    @PostMapping("/neighbor/detailNeighborCommentReply")
    @GetMapping("/neighbor/detailNeighborCommentReply")
    R detailNeighborCommentReply(@RequestParam("id") Long id);

    /**

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

@@ -1,9 +1,6 @@
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.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.partybuilding.*;
@@ -387,4 +384,19 @@
     */
    @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);
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -478,6 +478,13 @@
     */
    @PostMapping("updateuserispartymember")
    R updateUserIsPartymember(@RequestParam("idCard")String idCard);
    /**
     * 修改用户的为非党员状态
     * @param idCard 身份证号
     * @return 修改结果
     */
    @PostMapping("updateusernotpartymember")
    R updateUserNotPartymember(@RequestParam("idCard")String idCard);

    /**
     * 获取角色的权限配置列表

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -519,17 +519,17 @@
        return communityService.pageMyCommunityMessage(comActMessageVO);
    }

    @ApiOperation(value = "待认证党员分页查询")
    @GetMapping("pageprepartybuildingmember")
    @ApiOperation(value = "待认证党员分页查询",response = PartyBuildingMemberVO.class)
    @PostMapping("pageprepartybuildingmember")
    public R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO) {
        //totest 待认证党员分页查询
        //待认证党员分页查询
        return partyBuildingService.pagePrePartybuildingmember(pagePartyBuildingMemberVO);
    }

    @ApiOperation(value = "待认证党员审核")
    @PostMapping("reviewprepartybuildingmember")
    public R reviewPrePartybuildingmember(@RequestBody PartyBuildingMemberDTO partyBuildingMemberDTO) {
        //totest 待认证党员审核
        //待认证党员审核
        PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();
        partyBuildingMemberVO.setId(partyBuildingMemberDTO.getId());
        /**
@@ -548,10 +548,18 @@

        R updated = partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
        //审核通过： 修改用户的党员状态
        if(R.isOk(updated)) {
        if((1==partyBuildingMemberVO.getAuditResult()) && R.isOk(updated) ) {
            return userService.updateUserIsPartymember(updated.getData().toString());
        }else if(0==partyBuildingMemberVO.getAuditResult() && R.isOk(updated)){
            return userService.updateUserNotPartymember(updated.getData().toString());
        }
        return updated;
    }

    @ApiOperation(value = "删除认证党员审核")
    @PostMapping("/deleteprepartybuildingmember")
    public R deleteprepartybuildingmember(@RequestParam("id") Long id) {
        return partyBuildingService.deleteprepartybuildingmember(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMessageServiceImpl.java

@@ -154,6 +154,22 @@
            records.forEach(comActMessageVO1 -> {
                Long id = comActMessageVO1.getId();
                List<ComActMessageBackVO> list = comActMessageDAO.selectMsgBackList(id);
                if(list!=null&& list.size()>0) {
                    list.forEach(vo -> {
                        Long type = comActMessageVO1.getType();
                        if (type == 1) {
                            ComPbServiceTeamVO team = comActMessageDAO.selectComPbServiceTeamById(comActMessageVO1.getSendtoUserId());
                            if (!ObjectUtils.isEmpty(team)) {
                                vo.setUserJob(team.getJob());
                            }
                        } else if (type == 2) {
                            PartyCommitteeVO party = comActMessageDAO.selectPartyCommitteeById(comActMessageVO1.getSendtoUserId());
                            if (!ObjectUtils.isEmpty(party)) {
                                vo.setUserJob(party.getPosition());
                            }
                        }
                    });
                }
                comActMessageVO1.setBackList(list);
            });
            iPage.setRecords(records);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -84,8 +84,9 @@
                ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                        new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleAppVO.getId())
                .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq));
                if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
                                .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                if(circleFabulousDO != null){
                    circleAppVO.setHaveSign(1);
                }else{
                    circleAppVO.setHaveSign(2);
@@ -139,8 +140,9 @@
        ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId())
                        .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                        .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq));
        if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
                        .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
                        .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
        if(circleFabulousDO != null){
            circleDetailAppVO.setHaveSign(1);
        }else{
            circleDetailAppVO.setHaveSign(2);
@@ -155,8 +157,9 @@
                ComActNeighborCircleFabulousDO circleCommentFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                        new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleCommentVo.getId())
                                .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl));
                if(circleCommentFabulousDO != null && circleCommentFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
                                .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl)
                                .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                if(circleCommentFabulousDO != null){
                    circleCommentVo.setHaveSign(1);
                }else{
                    circleCommentVo.setHaveSign(2);
@@ -169,8 +172,9 @@
                        ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                                new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId())
                                        .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                                        .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf));
                        if(circleReplyFabulousDO != null && circleReplyFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){
                                        .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
                                        .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                        if(circleReplyFabulousDO != null){
                            commentReplyVO.setHaveSign(1);
                        }else{
                            commentReplyVO.setHaveSign(2);
@@ -592,6 +596,13 @@
            if(circleFabulousDO == null){
                return R.fail("未查询到点赞信息");
            }

            //减少邻里圈点赞数量
            ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(fabulousAppDTO.getServiceId());
            if(neighborCircleDO != null){
                neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() - 1);
                this.baseMapper.updateById(neighborCircleDO);
            }
        }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)){
            circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
@@ -601,6 +612,13 @@
            if(circleFabulousDO == null){
                return R.fail("未查询到点赞信息");
            }

            //减少邻里圈评论点赞数量
            ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentDO != null){
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() - 1);
                comActNeighborCircleCommentDAO.updateById(circleCommentDO);
            }
        }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)){
            circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
@@ -610,6 +628,12 @@
            if(circleFabulousDO == null){
                return R.fail("未查询到点赞信息");
            }
            //减少邻里圈评论回复点赞数量
            ComActNeighborCircleCommentReplyDO circleCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentReplyDO != null){
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() - 1);
                comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
            }
        }
        if(circleFabulousDO != null){
            circleFabulousDO.setIsEffective(ComActNeighborCircleFabulousDO.isEffective.no);

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

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
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.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_dangjian.model.dos.ComPbMemberDO;
@@ -515,7 +512,7 @@
     */
    @GetMapping("usercertification")
    R userCertification(@RequestParam("id")Long id){
        ComPbMemberDO comPbMemberDO = comPbMemberService.getOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
        ComPbMemberDO comPbMemberDO = comPbMemberService.getOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id).eq(ComPbMemberDO::getAuditResult, 1));
        return R.ok(comPbMemberDO);
    }

@@ -529,4 +526,24 @@
    R pageUserCertification(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO){
        return comPbMemberService.pagePrePartyBuilingMember(pagePartyBuildingMemberVO);
    }

    /**
     * 社区所有启用的党组织列表
     * @return 党组织集合
     */
    @PostMapping("listpartyorganizationByApp")
    public R listPartyOrganizationByApp(@RequestBody ComListPartyDTO comListPartyDTO){
        List<PartyOrganizationVO> partyOrganizationVOS=partyOrganizationService.listPartyOrganizationByApp(comListPartyDTO);
        return R.ok(partyOrganizationVOS);
    }

    /**
     * 根据党员认证id删除
     * @param id    党员认证id
     * @return  删除结果
     */
    @PostMapping("deleteprepartybuildingmember")
    public R deleteprepartybuildingmember(@RequestParam("id")Long id){
        return R.ok(comPbMemberService.removeById(id));
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -57,14 +57,14 @@
            "com_pb_member m\n" +
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
            "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
            " where m.community_id=#{pagePartyOrganizationVO.communityId} " +
            "<if test='pagePartyOrganizationVO.orgName != null and pagePartyOrganizationVO.orgName.trim() != &quot;&quot;'>" +
            " where m.community_id=#{pagePartyOrganizationVO.communityId} and m.audit_result='1' " +
            "<if test='pagePartyOrganizationVO.orgName != null and pagePartyOrganizationVO.orgName != &quot;&quot;'>" +
            "and o.name like concat(#{pagePartyOrganizationVO.orgName},'%') "+
            " </if> " +
            "<if test='pagePartyOrganizationVO.account != null and pagePartyOrganizationVO.account.trim() != &quot;&quot;'>" +
            "<if test='pagePartyOrganizationVO.account != null and pagePartyOrganizationVO.account != &quot;&quot;'>" +
            "and u.phone like concat (#{pagePartyOrganizationVO.account},'%')"+
            " </if> " +
            "<if test='pagePartyOrganizationVO.name != null and pagePartyOrganizationVO.name.trim() != &quot;&quot;'>" +
            "<if test='pagePartyOrganizationVO.name != null and pagePartyOrganizationVO.name != &quot;&quot;'>" +
            "and m.name like concat (#{pagePartyOrganizationVO.name},'%')"+
            " </if> " +

@@ -106,14 +106,14 @@
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
            "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
            " where m.user_id is not null  " +
            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone.trim() != &quot;&quot;'>" +
            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone != &quot;&quot;'>" +
            "and u.phone = #{pagePartyBuildingMemberVO.phone} "+
            " </if> " +
            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name.trim() != &quot;&quot;'>" +
            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name != &quot;&quot;'>" +
            "and u.name like concat (#{pagePartyBuildingMemberVO.name},'%')"+
            " </if> " +
            "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus.trim() != &quot;&quot;'>" +
            "and m.audit_status = #{pagePartyBuildingMemberVO.auditStatus}"+
            "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus != &quot;&quot;'>" +
            "and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}"+
            " </if> " +
            "order by m.join_time desc "+
            "</script>")
@@ -144,14 +144,14 @@
            "LEFT JOIN sys_user u ON m.id_card = u.id_card\n" +
            "LEFT JOIN com_pb_org o ON m.org_id = o.id"+
            " where m.audit_result in (0,3)  " +
            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone.trim() != &quot;&quot;'>" +
            " and u.phone = #{pagePartyBuildingMemberVO.phone} "+
            "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone != &quot;&quot;'>" +
            " and u.phone LIKE CONCAT('%',#{pagePartyBuildingMemberVO.phone},'%') "+
            " </if> " +
            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name.trim() != &quot;&quot;'>" +
            " and u.name like concat (#{pagePartyBuildingMemberVO.name},'%')"+
            "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name != &quot;&quot;'>" +
            " and u.name like concat ('%',#{pagePartyBuildingMemberVO.name},'%')"+
            " </if> " +
            "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus.trim() != &quot;&quot;'>" +
            " and m.audit_status = #{pagePartyBuildingMemberVO.auditStatus}"+
            "<if test='pagePartyBuildingMemberVO.auditStatus != null'>" +
            " and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}"+
            " </if> " +
            " order by m.join_time desc "+
            "</script>")

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/PartyOrganizationService.java

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

import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;

@@ -47,4 +48,10 @@
     * @return 编辑结果
     */
    R deletePartyOrganization(PartyOrganizationVO partyOrganizationVO);

    /**
     * 平台所有启用的党组织
     * @return 党组织集合
     */
    List<PartyOrganizationVO> listPartyOrganizationByApp(ComListPartyDTO comListPartyDTO);
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -66,8 +66,9 @@
    @Override
    public R addPartyBuildingMember(PartyBuildingMemberVO partyBuildingMemberVO) {
        String idCard = partyBuildingMemberVO.getIdCard();
        ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getIdCard, idCard));
        if (!ObjectUtils.isEmpty(comPbMemberDO)) {
        List<ComPbMemberDO> comPbMemberDOs = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda()
                .eq(ComPbMemberDO::getIdCard, idCard).eq(ComPbMemberDO::getAuditResult, 1));
        if (!ObjectUtils.isEmpty(comPbMemberDOs)&&comPbMemberDOs.size()>0) {
           return R.fail("身份证已经存在");
        }
        ComPbMemberDO comPbMemberDO1=new ComPbMemberDO();
@@ -77,6 +78,13 @@
        comPbMemberDO1.setUpdateAt(date);
        int insert = comPbMemberDAO.insert(comPbMemberDO1);
        if (insert>0) {
            //删除已驳回的记录
            int delete =  comPbMemberDAO.delete(new QueryWrapper<ComPbMemberDO>().lambda()
                    .eq(ComPbMemberDO::getIdCard, partyBuildingMemberVO.getIdCard())
                    .eq(ComPbMemberDO::getUserId, partyBuildingMemberVO.getUserId())
                    .eq(ComPbMemberDO::getCommunityId, partyBuildingMemberVO.getCommunityId())
                    .eq(ComPbMemberDO::getAuditResult, 3)
            );
            return R.ok();
        }
        return R.fail();
@@ -498,7 +506,7 @@
            return R.fail("未找到党员认证信息");
        }
        comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
        if(partyBuildingMemberVO.getAuditResult().equals(1)){
        if(partyBuildingMemberVO.getAuditResult()!=null && partyBuildingMemberVO.getAuditResult().equals(1)){
            comPbMemberDO.setUpdateAt(new Date());
        }
        if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/PartyOrganizationServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.dtos.partybuilding.ComListPartyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.PartyOrganizationVO;
import com.panzhihua.service_dangjian.dao.ComPbMemberDAO;
@@ -14,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -156,4 +158,24 @@
        }
        return R.fail();
    }

    public List<PartyOrganizationVO> listPartyOrganizationByApp(ComListPartyDTO comListPartyDTO){
        List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
        QueryWrapper<ComPbOrgDO> queryWrapper = new QueryWrapper<>();
        queryWrapper.lambda().eq(ComPbOrgDO::getCommunityId, comListPartyDTO.getCommunityId()).eq(ComPbOrgDO::getStatus, 1);
        if(!StringUtils.isEmpty(comListPartyDTO.getName())){
            queryWrapper.lambda().like(ComPbOrgDO::getName,comListPartyDTO.getName());
        }
        List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(queryWrapper);
        if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
            comPbOrgDOS.forEach(comPbOrgDO -> {
                PartyOrganizationVO partyOrganizationVO = new PartyOrganizationVO();
                partyOrganizationVO.setId(comPbOrgDO.getId());
                partyOrganizationVO.setName(comPbOrgDO.getName());
                partyOrganizationVO.setStatus(comPbOrgDO.getStatus());
                partyOrganizationVOS.add(partyOrganizationVO);
            });
        }
        return partyOrganizationVOS;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -569,6 +569,17 @@
        return userService.updateUserIsPartymember(idCard);
    }


    /**
     * 修改用户为非党员状态
     * @param idCard 身份证号
     * @return 修改结果
     */
    @PostMapping("updateusernotpartymember")
    R updateUserNotPartymember(@RequestParam("idCard")String idCard){
        return userService.updateUserNotPartymember(idCard);
    }

    /**
     * 获取各种协议
     *

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -246,7 +246,8 @@
            "u.continuous_landing_days + 1,\n" +
            "0)")
    int timedTaskContinuousLandingDays();
    @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
    @Select("select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,community_id,submit_user_id " +
            " from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
    ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
    @Update("update sys_user set face_state=null where user_id=#{userId}")
    int updateFaceState(Long userId);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -297,6 +297,12 @@
     */
    R updateUserIsPartymember(String idCard);
    /**
     * 修改用户为非党员状态
     * @param idCard 身份证号
     * @return 修改结果
     */
    R updateUserNotPartymember(String idCard);
    /**
     * 获取各种协议
     * @param type  1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
     * @return 协议内容

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -588,7 +588,7 @@
        log.info("用户实名认证发送请求，姓名：" + name + "身份证号码：" + idCard);
        boolean b = RealNameUtil.authentication(idCard, name);
        if (!b) {
            return R.fail("身份认证失败：公安系统认证错误");
            return R.fail("身份认证失败：请填写真实信息");
        }
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setName(name);
@@ -1429,6 +1429,24 @@
    }

    /**
     * 修改用户的党员状态
     *
     * @param idCard 身份证号
     * @return 修改结果
     */
    @Override
    public R updateUserNotPartymember(String idCard) {
        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1));
        if(sysUserDO != null){
            sysUserDO.setIsPartymember(0);
            userDao.updateById(sysUserDO);
            log.info("新增党员修改用户为非党员状态成功 身份证号【{}】", idCard);
        }
        return R.ok();
    }


    /**
     * 获取各种协议
     *
     * @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策