springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -353,6 +353,8 @@ PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO(); BeanUtils.copyProperties(comPbMemberCertificationDTO, partyBuildingMemberVO); partyBuildingMemberVO.setAuditResult(0); partyBuildingMemberVO.setCommunityId(communityId); //用户实名认证信息判断 String idCard = loginUserInfo.getIdCard(); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -379,4 +379,12 @@ */ @PostMapping("/partybuildIng/pageusercertification") R pagePrePartybuildingmember(@RequestBody PagePartyBuildingMemberVO pagePartyBuildingMemberVO); /** * 根据身份证号码查询党员信息 * @param idCard 身份证号码 * @return 党员信息 */ @PostMapping("/partybuildIng/getPartyBuildingByIdCard") R getPartyBuildingByIdCard(@RequestParam("idCard") String idCard); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -549,7 +549,7 @@ R updated = partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO); //审核通过： 修改用户的党员状态 if(R.isOk(updated)) { userService.updateUserIsPartymember(partyBuildingMemberVO.getIdCard()); return userService.updateUserIsPartymember(updated.getData().toString()); } return updated; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/model/dto/PartyBuildingMemberDTO.java
@@ -17,4 +17,7 @@ @NotBlank(message = "操作类型不能为空") private Integer type; @ApiModelProperty(value = "身份证号", required = true) private String idCard; } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java
@@ -177,8 +177,7 @@ */ @PostMapping("updatepartybuildingmember") public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO){ return comPbMemberService.updatePartyBuildingMember(partyBuildingMemberVO); return comPbMemberService.updatePartyBuildingMembers(partyBuildingMemberVO); } /** springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java
@@ -118,4 +118,42 @@ "order by m.join_time desc "+ "</script>") IPage<PartyBuildingMemberVO> pagePartyBuildingMemberVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO); @Select("<script> " + "SELECT\n" + "o.`name` orgName,\n" + "m.org_id,\n"+ "m.id_card,\n"+ "m.`id`,\n" + "u.phone,\n" + "m.`name`,\n" + "m.photo_path,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "m.employment_time,\n" + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) partyAge,\n" + "m.join_time,\n" + "m.audit_result, \n" + "m.employment_time,\n" + "CASE\n" + "WHEN u.id_card IS NULL THEN\n" + "'未注册' ELSE '已注册' \n" + "END STATUS \n" + "FROM\n" + "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.audit_result in (0,3) " + "<if test='pagePartyBuildingMemberVO.phone != null and pagePartyBuildingMemberVO.phone.trim() != ""'>" + " and u.phone = #{pagePartyBuildingMemberVO.phone} "+ " </if> " + "<if test='pagePartyBuildingMemberVO.name != null and pagePartyBuildingMemberVO.name.trim() != ""'>" + " and u.name like concat (#{pagePartyBuildingMemberVO.name},'%')"+ " </if> " + "<if test='pagePartyBuildingMemberVO.auditStatus != null and pagePartyBuildingMemberVO.auditStatus.trim() != ""'>" + " and m.audit_status = #{pagePartyBuildingMemberVO.auditStatus}"+ " </if> " + " order by m.join_time desc "+ "</script>") IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
@@ -61,7 +61,7 @@ /** * 党员审查结果 */ private String auditResult; private Integer auditResult; /** * 创建时间 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/ComPbMemberService.java
@@ -126,4 +126,11 @@ * @return 分页数据 */ R pagePrePartyBuilingMember(PagePartyBuildingMemberVO pagePartyBuildingMemberVO); /** * 审核党员认证信息 * @param partyBuildingMemberVO 编辑字段 * @return 编辑结果 */ R updatePartyBuildingMembers(PartyBuildingMemberVO partyBuildingMemberVO); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -181,6 +181,7 @@ partyBuildingMemberVO.setOrgId(null); } BeanUtils.copyProperties(partyBuildingMemberVO,comPbMemberDO); comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult()); int i = comPbMemberDAO.updateById(comPbMemberDO); if (i>0) { return R.ok(); @@ -251,7 +252,7 @@ comPbMemberRoleDO.setUpdateAt(new Date()); comPbMemberRoleDO.setPositionTwo(partyCommitteeVO.getPositionTwo()); comPbMemberRoleDO.setIsReg(2); PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId()); PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId()); String oldphone = oldPartyCommitteeVO.getPhone(); SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone); String newphone=partyCommitteeVO.getPhone(); @@ -489,9 +490,25 @@ } page.setSize(pageSize); page.setCurrent(pageNum); IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyBuildingMemberVO(page, pagePartyBuildingMemberVO); IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyBuildingMembersVO(page, pagePartyBuildingMemberVO); return R.ok(iPage); } @Override public R updatePartyBuildingMembers(PartyBuildingMemberVO partyBuildingMemberVO){ ComPbMemberDO comPbMemberDO = comPbMemberDAO.selectById(partyBuildingMemberVO.getId()); if(comPbMemberDO == null){ return R.fail("未找到党员认证信息"); } comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult()); if(partyBuildingMemberVO.getAuditResult().equals(1)){ comPbMemberDO.setUpdateAt(new Date()); } if (comPbMemberDAO.updateById(comPbMemberDO) > 0) { return R.ok(comPbMemberDO.getIdCard()); } return R.fail(); } } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -355,4 +355,10 @@ " where user_id = #{userArchivesVO.userId}") void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO); @Select("update com_pb_member set user_id = #{userId} where audit_result = 1 and id_card = #{idCard}") void updateComPbMemberUserId(@Param("idCard")String idCard, @Param("userId")Long userId); @Select("select id from com_pb_member where audit_result = 1 and id_card = #{idCard}") Long getPartyBuildingByIdCard(@Param("idCard")String idCard); } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -18,6 +18,7 @@ import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.common.model.vos.user.*; import com.panzhihua.common.service.partybuilding.PartyBuildingService; import com.panzhihua.common.utlis.IdCard; import com.panzhihua.common.utlis.RealNameUtil; import com.panzhihua.common.utlis.SensitiveUtil; @@ -603,6 +604,14 @@ } int update = userDao.updateById(sysUserDO); if (update > 0) { //实名认证成功查询是否有已审核的党员信息，有则更新党员信息绑定党员的userId Long memberId = userDao.getPartyBuildingByIdCard(idCard); if(memberId != null){ sysUserDO.setIsPartymember(1); userDao.updateById(sysUserDO); //修改审核绑定的userId userDao.updateComPbMemberUserId(idCard,sysUserDO.getUserId()); } return R.ok(); } return R.fail(); @@ -1409,14 +1418,13 @@ */ @Override public R updateUserIsPartymember(String idCard) { SysUserDO sysUserDO = new SysUserDO(); sysUserDO.setIsPartymember(1); int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard)); if (update > 0) { SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1)); if(sysUserDO != null){ sysUserDO.setIsPartymember(1); userDao.updateById(sysUserDO); log.info("新增党员修改用户党员状态成功 身份证号【{}】", idCard); return R.ok(); } return R.fail(); return R.ok(); } /**
