From 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d Mon Sep 17 00:00:00 2001
From: hhhyyq <hhhyyq@163.com>
Date: 星期三, 17 三月 2021 00:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 2c722e4..a31e167 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -8,10 +8,13 @@
import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
+import com.panzhihua.common.model.vos.user.SysUserVO;
import com.panzhihua.common.utlis.RichTextUtil;
+import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_dangjian.dao.*;
import com.panzhihua.service_dangjian.model.dos.*;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
+
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -157,6 +160,9 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<PartyBuildingMemberVO> iPage=comPbMemberDAO.pagePartyOrganization(page, pagePartyOrganizationVO);
+ iPage.getRecords().forEach(record->{
+ record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
+ });
return R.ok(iPage);
}
@@ -189,13 +195,13 @@
*/
@Override
public R listPartyMember(Long communityId) {
-// List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId));
+ List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectList(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getCommunityId,communityId));
// 查询社区所有已经注册的党员
// 排除掉已经成为党委的党员
- List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId);
- if (ObjectUtils.isEmpty(comPbMemberDOS)) {
- return R.ok(new ArrayList<>());
- }
+// List<ComPbMemberDO> comPbMemberDOS = comPbMemberDAO.selectListRegister(communityId);
+// if (ObjectUtils.isEmpty(comPbMemberDOS)) {
+// return R.ok(new ArrayList<>());
+// }
List<PartyBuildingMemberVO> partyBuildingMemberVOS=new ArrayList<>();
comPbMemberDOS.forEach(comPbMemberDO -> {
PartyBuildingMemberVO partyBuildingMemberVO=new PartyBuildingMemberVO();
@@ -213,18 +219,15 @@
*/
@Override
public R addPartyCommittee(PartyCommitteeVO partyCommitteeVO) {
- Long partyMemberId = partyCommitteeVO.getPartyMemberId();
- if (null==partyMemberId||0==partyMemberId) {
- return R.fail("党员id不能为空");
- }
- ComPbMemberRoleDO comPbMemberRoleDO1 = comPbMemberRoleDAO.selectOne(new QueryWrapper<ComPbMemberRoleDO>().lambda().eq(ComPbMemberRoleDO::getMemberId, partyMemberId));
- if (!ObjectUtils.isEmpty(comPbMemberRoleDO1)) {
- return R.fail("党员身份已经存在");
- }
ComPbMemberRoleDO comPbMemberRoleDO=new ComPbMemberRoleDO();
- comPbMemberRoleDO.setCommunityId(partyCommitteeVO.getCommunityId());
- comPbMemberRoleDO.setMemberId(partyMemberId);
- comPbMemberRoleDO.setRoleId(partyCommitteeVO.getRoleId());
+ BeanUtils.copyProperties(partyCommitteeVO,comPbMemberRoleDO);
+ comPbMemberRoleDO.setCreateAt(new Date());
+ comPbMemberRoleDO.setUpdateAt(new Date());
+ comPbMemberRoleDO.setIsReg(2);
+ SysUserVO sysUser = comPbMemberRoleDAO.getSysUserByPhone(partyCommitteeVO.getPhone());
+ if(!ObjectUtils.isEmpty(sysUser)) {
+ comPbMemberRoleDO.setIsReg(1);
+ }
int insert = comPbMemberRoleDAO.insert(comPbMemberRoleDO);
if (insert>0) {
return R.ok();
@@ -241,10 +244,22 @@
@Override
public R updatePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
ComPbMemberRoleDO comPbMemberRoleDO=new ComPbMemberRoleDO();
- comPbMemberRoleDO.setCommunityId(partyCommitteeVO.getCommunityId());
- comPbMemberRoleDO.setMemberId(partyCommitteeVO.getPartyMemberId());
- comPbMemberRoleDO.setRoleId(partyCommitteeVO.getRoleId());
- comPbMemberRoleDO.setId(partyCommitteeVO.getId());
+ BeanUtils.copyProperties(partyCommitteeVO,comPbMemberRoleDO);
+ ComPbMemberRoleDO comPbMemberRoleDOOld = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId());
+ comPbMemberRoleDO.setCreateAt(comPbMemberRoleDOOld.getCreateAt());
+ comPbMemberRoleDO.setUpdateAt(new Date());
+ comPbMemberRoleDO.setIsReg(2);
+ PartyCommitteeVO oldPartyCommitteeVO = comPbMemberRoleDAO.selectPartyCommitteeById(partyCommitteeVO.getId());
+ String oldphone = oldPartyCommitteeVO.getPhone();
+ SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone);
+ String newphone=partyCommitteeVO.getPhone();
+ SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone);
+ if(!ObjectUtils.isEmpty(sysUserOld)||!ObjectUtils.isEmpty(sysUserNew)) {
+ comPbMemberRoleDO.setIsReg(1);
+ }
+ if(!newphone.equals(oldphone)) {
+ comPbMemberRoleDAO.updateUserPhone(newphone, oldphone);
+ }
int update = comPbMemberRoleDAO.updateById(comPbMemberRoleDO);
if (update>0) {
return R.ok();
@@ -287,6 +302,9 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<PartyCommitteeVO> iPage=comPbMemberRoleDAO.pagePartyOrganization(page, partyCommitteeVO);
+ iPage.getRecords().forEach(record->{
+ record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
+ });
return R.ok(iPage);
}
@@ -454,8 +472,5 @@
log.info("定时任务更新党建动态发布状态数量【{}】",num);
return R.ok(num);
}
-
-
-
}
--
Gitblit v1.7.1