From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 134 +++++---------------------------------------
1 files changed, 17 insertions(+), 117 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 e24c51b..b101ca9 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
@@ -93,7 +93,9 @@
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("身份证已经存在");
+ comPbMemberDOs.forEach(comPbMemberDO -> {
+ comPbMemberDAO.deleteById(comPbMemberDO.getId());
+ });
}
ComPbMemberDO comPbMemberDO1 = new ComPbMemberDO();
BeanUtils.copyProperties(partyBuildingMemberVO, comPbMemberDO1);
@@ -102,28 +104,6 @@
comPbMemberDO1.setUpdateAt(date);
int insert = comPbMemberDAO.insert(comPbMemberDO1);
if (insert > 0) {
- //金沙特殊需求
- if(comPbMemberDO1.getCommunityId()==2L){
- ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
- comMngVolunteerMngVO.setOrgId(53L);
- comMngVolunteerMngVO.setName(comPbMemberDO1.getName());
- comMngVolunteerMngVO.setPhone(comPbMemberDO1.getPhone());
- comMngVolunteerMngVO.setIdCard(comPbMemberDO1.getIdCard());
- comMngVolunteerMngVO.setState(2);
- comMngVolunteerMngVO.setCommunityId(2L);
- R r = communityService.addVolunteer(comMngVolunteerMngVO);
- // 支援者添加成功，修改小程序用户的志愿者状态 ，通过手机号
- if (R.isOk(r)) {
- String phone = comMngVolunteerMngVO.getPhone();
- R r1 = userService.putUserIsVolunteer(phone, 1);
- if (R.isOk(r1)) {
- log.info("修改手机号【{}】的支援者状态为是", phone);
- } else {
- log.info("手机号【{}】没有小程序用户", phone);
- }
- }
- }
-
// 删除已驳回的记录
int delete = comPbMemberDAO.delete(new QueryWrapper<ComPbMemberDO>().lambda()
.eq(ComPbMemberDO::getIdCard, partyBuildingMemberVO.getIdCard())
@@ -147,7 +127,7 @@
public R listSavePartyBuildingMemberExcelVO(List<PartyBuildingMemberExcelVO> list) {
// Boolean aBoolean = stringRedisTemplate.hasKey(REDIS_ORG_ALL);
// ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
- List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
+ //List<PartyOrganizationVO> partyOrganizationVOS = new ArrayList<>();
// if (aBoolean) {
// String orgs = valueOperations.get(REDIS_ORG_ALL);
// if (!ObjectUtils.isEmpty(orgs)) {
@@ -168,42 +148,17 @@
// }
// valueOperations.set(REDIS_ORG_ALL,JSONArray.toJSONString(partyOrganizationVOS),24, TimeUnit.HOURS);
// }
- List<ComPbOrgDO> comPbOrgDOS = comPbOrgDAO.selectList(new LambdaQueryWrapper<>());
- if (!ObjectUtils.isEmpty(comPbOrgDOS)) {
- List<PartyOrganizationVO> partyOrganizationVOList = new ArrayList<>();
- comPbOrgDOS.forEach(comPbOrgDO -> {
- PartyOrganizationVO partyOrganizationVO = new PartyOrganizationVO();
- partyOrganizationVO.setId(comPbOrgDO.getId());
- partyOrganizationVO.setName(comPbOrgDO.getName());
- partyOrganizationVO.setCommunityId(comPbOrgDO.getCommunityId());
- partyOrganizationVOList.add(partyOrganizationVO);
- });
- partyOrganizationVOS = partyOrganizationVOList;
- }
List<ComPbMemberDO> comPbMemberDOS = new ArrayList<>();
if (!ObjectUtils.isEmpty(list)) {
- List<PartyOrganizationVO> partyOrganizationVOArrayList = partyOrganizationVOS;
for (PartyBuildingMemberExcelVO partyBuildingMemberExcelVO : list) {
- ComPbMemberDO comPbMemberDO = new ComPbMemberDO();
- Date date = new Date();
- comPbMemberDO.setUpdateAt(date);
- comPbMemberDO.setCreateAt(date);
- String orgName = partyBuildingMemberExcelVO.getOrgName();
- List<PartyOrganizationVO> collect = partyOrganizationVOArrayList.stream()
- .filter(partyOrganizationVO -> orgName.equals(partyOrganizationVO.getName()))
- .collect(Collectors.toList());
- if (ObjectUtils.isEmpty(collect)) {
- throw new PartyBuildingMemberException(
- "导入失败，组织不存在" + partyBuildingMemberExcelVO.getOrgName() + "，请先在“党支部管理”中添加该党支部");
- } else {
- PartyOrganizationVO partyOrganizationVO = collect.get(0);
- comPbMemberDO.setOrgId(partyOrganizationVO.getId());
- comPbMemberDO.setCommunityId(partyOrganizationVO.getCommunityId());
-
+ if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getName())&&StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getPhone())&&StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getOrgName())){
+ ComPbMemberDO comPbMemberDO = new ComPbMemberDO();
+ Date date = new Date();
+ comPbMemberDO.setUpdateAt(date);
+ comPbMemberDO.setCreateAt(date);
List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>()
- .lambda().eq(ComPbMemberDO::getIdCard, partyBuildingMemberExcelVO.getIdCard())
- .eq(ComPbMemberDO::getCommunityId, partyOrganizationVO.getCommunityId())
- .in(ComPbMemberDO::getAuditResult, 0, 1));
+ .lambda().eq(ComPbMemberDO::getPhone, partyBuildingMemberExcelVO.getPhone())
+ .eq(ComPbMemberDO::getCommunityId, partyBuildingMemberExcelVO.getCommunityId()));
if (!comPbMemberDOList.isEmpty()) {
comPbMemberDOList.forEach(comPbMember -> {
BeanUtils.copyProperties(partyBuildingMemberExcelVO, comPbMember);
@@ -214,70 +169,15 @@
// partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" +
// partyBuildingMemberExcelVO.getName());
}
+ BeanUtils.copyProperties(partyBuildingMemberExcelVO,comPbMemberDO);
+ comPbMemberDOS.add(comPbMemberDO);
}
-
- if (StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime())
- && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())) {
- throw new PartyBuildingMemberException(
- "导入失败,您导入的数据中有转正日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getEmploymentTime() + "，错误人名："
- + partyBuildingMemberExcelVO.getName());
+ else {
+ throw new PartyBuildingMemberException("导入失败，你导入的内容有未填报项");
}
-
- if (StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime())
- && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getJoinTime())) {
- throw new PartyBuildingMemberException("导入失败,您导入的数据中有入党日期格式错误，错误数据:"
- + partyBuildingMemberExcelVO.getJoinTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
- }
-
- if (StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime())) {
- Date employmentTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getEmploymentTime());
- comPbMemberDO.setEmploymentTime(employmentTime);
- } else {
- comPbMemberDO.setEmploymentTime(null);
- }
-
- if (StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime())) {
- Date joinTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getJoinTime());
- comPbMemberDO.setJoinTime(joinTime);
- } else {
- comPbMemberDO.setJoinTime(null);
- }
-
- comPbMemberDO.setName(partyBuildingMemberExcelVO.getName());
- comPbMemberDO.setIdCard(partyBuildingMemberExcelVO.getIdCard());
- comPbMemberDO.setPhone(partyBuildingMemberExcelVO.getPhone());
- comPbMemberDOS.add(comPbMemberDO);
}
+ this.saveBatch(comPbMemberDOS);
}
- comPbMemberDOS.forEach(comPbMemberDO -> {
- boolean flag=this.save(comPbMemberDO);
- if(flag){
- //修改党员状态
- userService.updateUserIsPartymember(comPbMemberDO.getIdCard());
- //金沙社区特殊需求 添加党员默认添加志愿者
- if(comPbMemberDO.getCommunityId()==2L){
- ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
- comMngVolunteerMngVO.setOrgId(53L);
- comMngVolunteerMngVO.setName(comPbMemberDO.getName());
- comMngVolunteerMngVO.setPhone(comPbMemberDO.getPhone());
- comMngVolunteerMngVO.setIdCard(comPbMemberDO.getIdCard());
- comMngVolunteerMngVO.setState(2);
- comMngVolunteerMngVO.setCommunityId(2L);
- R r = communityService.addVolunteer(comMngVolunteerMngVO);
- // 支援者添加成功，修改小程序用户的志愿者状态 ，通过手机号
- if (R.isOk(r)) {
- String phone = comMngVolunteerMngVO.getPhone();
- R r1 = userService.putUserIsVolunteer(phone, 1);
- if (R.isOk(r1)) {
- log.info("修改手机号【{}】的支援者状态为是", phone);
- } else {
- log.info("手机号【{}】没有小程序用户", phone);
- }
- }
- }
- }
-
- });
return R.ok();
}
@@ -673,7 +573,7 @@
int delete = comPbMemberDAO.deleteById(id);
if (delete > 0) {
// 维护用户表党员状态
- comPbMemberDAO.updateUserIsPartymember(comPbMemberDO.getIdCard());
+ comPbMemberDAO.updateUserIsPartymember(comPbMemberDO.getPhone());
// 删除缓存
String userKey = UserConstants.LOGIN_USER_INFO + comPbMemberDO.getUserId();
stringRedisTemplate.delete(userKey);
--
Gitblit v1.7.1