Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-07 59d3d6ad85bad326c35aa196fdb0550b2de1731d

Merge remote-tracking branch 'origin/test' into test

 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,9 +342,11 @@
        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) {
@@ -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/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/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

@@ -533,14 +533,14 @@
    @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());
        /**
@@ -559,8 +559,10 @@

        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;
    }

 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_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -512,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);
    }


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

@@ -58,7 +58,7 @@
            "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} " +
            " 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> " +

 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_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

@@ -1430,6 +1430,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隐私政策