From b2c975094e4a3cac5ba67c154e9b7b4fd0ce35c9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 25 四月 2022 17:34:36 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 80 ++-------------------------------------
1 files changed, 5 insertions(+), 75 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..30d8530 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())
@@ -201,7 +181,7 @@
comPbMemberDO.setCommunityId(partyOrganizationVO.getCommunityId());
List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>()
- .lambda().eq(ComPbMemberDO::getIdCard, partyBuildingMemberExcelVO.getIdCard())
+ .lambda().eq(ComPbMemberDO::getPhone, partyBuildingMemberExcelVO.getPhone())
.eq(ComPbMemberDO::getCommunityId, partyOrganizationVO.getCommunityId())
.in(ComPbMemberDO::getAuditResult, 0, 1));
if (!comPbMemberDOList.isEmpty()) {
@@ -215,36 +195,7 @@
// partyBuildingMemberExcelVO.getName());
}
}
-
- if (StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime())
- && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())) {
- throw new PartyBuildingMemberException(
- "导入失败,您导入的数据中有转正日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getEmploymentTime() + "，错误人名："
- + partyBuildingMemberExcelVO.getName());
- }
-
- 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);
}
@@ -253,28 +204,7 @@
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);
- }
- }
- }
+ userService.updateUserIsPartymemberByPhone(comPbMemberDO.getPhone());
}
});
--
Gitblit v1.7.1