From 37fade33b20eda05ee3d90dc023341035fbe5dc3 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 18 二月 2022 16:02:43 +0800
Subject: [PATCH] 党建接口开发
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 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 783fe1c..c900f4b 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
@@ -226,7 +226,7 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- IPage<PartyBuildingMemberVO> iPage = comPbMemberDAO.pagePartyOrganization(page, pagePartyOrganizationVO);
+ IPage<PartyBuildingMemberVO> iPage = comPbMemberDAO.queryAllByLimit(page, pagePartyOrganizationVO);
iPage.getRecords().forEach(record -> {
record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
});
@@ -290,15 +290,38 @@
* @return 新增结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R addPartyCommittee(PartyCommitteeVO partyCommitteeVO) {
ComPbMemberRoleDO comPbMemberRoleDO = new ComPbMemberRoleDO();
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)) {
+ Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
+ if (userCount > 0) {
comPbMemberRoleDO.setIsReg(1);
+ }
+ Date nowDate = new Date();
+ //判断党员信息是否存在党委信息
+ ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
+ .eq(ComPbMemberDO::getIdCard,partyCommitteeVO.getIdCard())
+ .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
+ .eq(ComPbMemberDO::getCommunityId,partyCommitteeVO.getCommunityId()));
+ if(pbMemberDO == null){
+ //不存在则创建党委党员信息
+ pbMemberDO = new ComPbMemberDO();
+ BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
+ pbMemberDO.setAuditResult(ComPbMemberDO.AuditResult.SHTG);
+ pbMemberDO.setCreateAt(nowDate);
+ pbMemberDO.setUpdateAt(nowDate);
+ pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
+ comPbMemberDAO.insert(pbMemberDO);
+ }else{
+ //存在则更新党委党员信息
+ BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
+ pbMemberDO.setUpdateAt(nowDate);
+ pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
+ comPbMemberDAO.updateById(pbMemberDO);
}
int insert = comPbMemberRoleDAO.insert(comPbMemberRoleDO);
if (insert > 0) {
@@ -315,24 +338,27 @@
* @return 编辑结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R updatePartyCommittee(PartyCommitteeVO partyCommitteeVO) {
ComPbMemberRoleDO comPbMemberRoleDO = new ComPbMemberRoleDO();
+ Date nowDate = new Date();
BeanUtils.copyProperties(partyCommitteeVO, comPbMemberRoleDO);
- ComPbMemberRoleDO comPbMemberRoleDOOld = comPbMemberRoleDAO.selectById(partyCommitteeVO.getId());
- comPbMemberRoleDO.setCreateAt(comPbMemberRoleDOOld.getCreateAt());
- comPbMemberRoleDO.setUpdateAt(new Date());
- comPbMemberRoleDO.setPositionTwo(partyCommitteeVO.getPositionTwo());
+ comPbMemberRoleDO.setUpdateAt(nowDate);
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)) {
+ Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
+ if (userCount > 0) {
comPbMemberRoleDO.setIsReg(1);
}
- if (!newphone.equals(oldphone)) {
- comPbMemberRoleDAO.updateUserPhone(newphone, oldphone);
+ //查询党员信息并更新
+ ComPbMemberDO pbMemberDO = comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda()
+ .eq(ComPbMemberDO::getIdCard,partyCommitteeVO.getIdCard())
+ .eq(ComPbMemberDO::getAuditResult,ComPbMemberDO.AuditResult.SHTG)
+ .eq(ComPbMemberDO::getCommunityId,partyCommitteeVO.getCommunityId()));
+ if(pbMemberDO != null){
+ BeanUtils.copyProperties(partyCommitteeVO, pbMemberDO);
+ pbMemberDO.setUpdateAt(nowDate);
+ pbMemberDO.setType(ComPbMemberDO.Type.ZSDY);
+ comPbMemberDAO.updateById(pbMemberDO);
}
int update = comPbMemberRoleDAO.updateById(comPbMemberRoleDO);
if (update > 0) {
@@ -356,10 +382,9 @@
}
int delete = comPbMemberRoleDAO.deleteById(partyCommitteeVO.getId());
if (delete > 0) {
- SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbMemberRoleDO.getPhone());
+ Long userId = comPbMemberRoleDAO.getUserIdByIdCard(comPbMemberRoleDO.getIdCard());
// 删除用户信息缓存
- if (sysUserVO != null) {
- Long userId = sysUserVO.getUserId();
+ if (userId != null) {
String userKey = UserConstants.LOGIN_USER_INFO + userId;
stringRedisTemplate.delete(userKey);
return R.ok();
@@ -591,6 +616,7 @@
if (comPbMemberDO == null) {
return R.fail("未找到党员认证信息");
}
+ BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO);
comPbMemberDO.setAuditResult(partyBuildingMemberVO.getAuditResult());
if (partyBuildingMemberVO.getAuditResult() != null && partyBuildingMemberVO.getAuditResult().equals(3)) {
comPbMemberDO.setRefuseReason(partyBuildingMemberVO.getRefuseReason());
--
Gitblit v1.7.1