From 0965590521cd58e6fcc8d2ac97f4fa6b01e3e67e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 14 三月 2022 15:35:38 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 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 875bf6f..584ad3f 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
@@ -15,10 +15,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.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;
@@ -72,6 +75,10 @@
private ComPbDynDAO comPbDynDAO;
@Resource
private ComPbDynUserDAO comPbDynUserDAO;
+ @Resource
+ private CommunityService communityService;
+ @Resource
+ private UserService userService;
/**
* 新增党员
@@ -95,6 +102,27 @@
comPbMemberDO1.setUpdateAt(date);
int insert = comPbMemberDAO.insert(comPbMemberDO1);
if (insert > 0) {
+ //金沙社区特殊需求 添加党员默认添加志愿者
+ if(partyBuildingMemberVO.getCommunityId()==2){
+ ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
+ comMngVolunteerMngVO.setOrgId(53L);
+ comMngVolunteerMngVO.setName(partyBuildingMemberVO.getName());
+ comMngVolunteerMngVO.setPhone(partyBuildingMemberVO.getPhone());
+ comMngVolunteerMngVO.setIdCard(partyBuildingMemberVO.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())
@@ -219,6 +247,29 @@
comPbMemberDOS.add(comPbMemberDO);
}
}
+ comPbMemberDOS.forEach(comPbMemberDO -> {
+ //金沙社区特殊需求 添加党员默认添加志愿者
+ 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);
+ }
+ }
+ }
+ });
this.saveBatch(comPbMemberDOS);
return R.ok();
}
--
Gitblit v1.7.1