From 7bfa6a85ad6a6c537b0f7ddb9f6a8795c8e8c866 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 09 六月 2022 16:44:24 +0800
Subject: [PATCH] 五社&社区企业&人大代表
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 e6c6f12..32d84af 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
@@ -5,7 +5,6 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -15,15 +14,13 @@
import com.panzhihua.common.enums.ComPbMemberRoleTypeEnum;
import com.panzhihua.common.model.dtos.partybuilding.ComDataStatisticsOrgDto;
import com.panzhihua.common.model.dtos.partybuilding.PageComDataStatisticsMemberDto;
+import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComDataStatisticsMemberExcelVo;
-import com.panzhihua.common.model.vos.partybuilding.excel.ComPbCheckUnitErrorExcelVO;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo;
import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleExcelVo;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.service_dangjian.entity.ComPbCheckUnit;
-import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -40,7 +37,6 @@
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.DateUtils;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
@@ -348,7 +344,8 @@
comPbMemberRoleDO.setCreateAt(new Date());
comPbMemberRoleDO.setUpdateAt(new Date());
comPbMemberRoleDO.setIsReg(2);
- Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
+ comPbMemberRoleDO.setSex(Integer.parseInt(partyCommitteeVO.getIdCard().substring(16,17))%2==0?2:1);
+ Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard(), partyCommitteeVO.getAreaCode());
if (userCount > 0) {
comPbMemberRoleDO.setIsReg(1);
}
@@ -396,7 +393,7 @@
BeanUtils.copyProperties(partyCommitteeVO, comPbMemberRoleDO);
comPbMemberRoleDO.setUpdateAt(nowDate);
comPbMemberRoleDO.setIsReg(2);
- Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard());
+ Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(partyCommitteeVO.getIdCard(), partyCommitteeVO.getAreaCode());
if (userCount > 0) {
comPbMemberRoleDO.setIsReg(1);
}
@@ -435,7 +432,7 @@
}
int delete = comPbMemberRoleDAO.deleteById(partyCommitteeVO.getId());
if (delete > 0) {
- Long userId = comPbMemberRoleDAO.getUserIdByIdCard(comPbMemberRoleDO.getIdCard());
+ Long userId = comPbMemberRoleDAO.getUserIdByIdCard(comPbMemberRoleDO.getIdCard(), partyCommitteeVO.getAreaCode());
// 删除用户信息缓存
if (userId != null) {
String userKey = UserConstants.LOGIN_USER_INFO + userId;
@@ -622,6 +619,9 @@
}
int delete = comPbMemberDAO.deleteById(id);
if (delete > 0) {
+ comPbMemberRoleDAO.delete(new LambdaQueryWrapper<ComPbMemberRoleDO>()
+ .eq(ComPbMemberRoleDO::getIdCard, comPbMemberDO.getIdCard())
+ .eq(ComPbMemberRoleDO::getCommunityId, comPbMemberDO.getCommunityId()));
// 维护用户表党员状态
comPbMemberDAO.updateUserIsPartymember(comPbMemberDO.getIdCard());
// 删除缓存
@@ -814,7 +814,7 @@
}
//查询左下数据
- statisticsVo = comPbMemberDAO.getOrgDataStatisticsLeftDown(communityId,orgIds,startTime,endTime);
+ statisticsVo = comPbMemberDAO.getOrgDataStatisticsLeftDown(communityId,orgIds,startTime,endTime, statisticsOrgDto.getAreaCode());
if(statisticsVo != null){
statisticsOrgVo.setParticipateVolunteerActivityDuration(statisticsVo.getParticipateVolunteerActivityDuration());
statisticsOrgVo.setParticipateVolunteerActivityNum(statisticsVo.getParticipateVolunteerActivityNum());
@@ -823,7 +823,7 @@
//查询党员数据
IPage<PartyBuildingMemberVO> partyMemberPage = comPbMemberDAO.getOrgDataStatisticsMember(new Page(statisticsOrgDto.getPageNum()
- ,statisticsOrgDto.getPageSize()),communityId,orgIds);
+ ,statisticsOrgDto.getPageSize()),communityId,orgIds, statisticsOrgDto.getAreaCode());
if(partyMemberPage.getRecords() != null && !partyMemberPage.getRecords().isEmpty()){
statisticsOrgVo.setPartyMemberList(partyMemberPage.getRecords());
}
@@ -979,6 +979,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R importPbMemberRole(List<ComPbMemberRoleExcelVo> list, Long communityId, Long userId) {
+ ComActVO actVO = comPbMemberRoleDAO.selectActById(communityId);
ArrayList<ComPbMemberRoleErrorExcelVo> mistakes = Lists.newArrayList();
ArrayList<ComPbMemberRoleDO> saveList = Lists.newArrayList();
Date nowDate = new Date();
@@ -1025,7 +1026,7 @@
mistakes.add(roleErrorExcelVo);
return;
}
- Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(memberRole.getIdCard());
+ Integer userCount = comPbMemberRoleDAO.getSysUserByIdCardCount(memberRole.getIdCard(), actVO.getAreaCode());
memberRoleDO.setIsReg(userCount > 0 ? 1 : 2);
memberRoleDO.setCommunityId(communityId);
saveList.add(memberRoleDO);
--
Gitblit v1.7.1