From be376c014e4c097d0d00e498e4aa4f100628a7b6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 26 四月 2022 14:16:38 +0800
Subject: [PATCH] 花城E+防疫修改
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 60 +++++-------------------------------------------------------
1 files changed, 5 insertions(+), 55 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 30d8530..2ac85f6 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
@@ -148,66 +148,16 @@
// }
// 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());
-
- List<ComPbMemberDO> comPbMemberDOList = this.baseMapper.selectList(new QueryWrapper<ComPbMemberDO>()
- .lambda().eq(ComPbMemberDO::getPhone, partyBuildingMemberExcelVO.getPhone())
- .eq(ComPbMemberDO::getCommunityId, partyOrganizationVO.getCommunityId())
- .in(ComPbMemberDO::getAuditResult, 0, 1));
- if (!comPbMemberDOList.isEmpty()) {
- comPbMemberDOList.forEach(comPbMember -> {
- BeanUtils.copyProperties(partyBuildingMemberExcelVO, comPbMember);
- this.baseMapper.updateById(comPbMember);
- });
- continue;
- // throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+
- // partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" +
- // partyBuildingMemberExcelVO.getName());
- }
- }
- comPbMemberDO.setName(partyBuildingMemberExcelVO.getName());
- comPbMemberDO.setPhone(partyBuildingMemberExcelVO.getPhone());
- comPbMemberDOS.add(comPbMemberDO);
- }
- }
- comPbMemberDOS.forEach(comPbMemberDO -> {
+ list.forEach(partyBuildingMemberExcelVO -> {
+ ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
+ BeanUtils.copyProperties(partyBuildingMemberExcelVO,comPbMemberDO);
boolean flag=this.save(comPbMemberDO);
if(flag){
//修改党员状态
userService.updateUserIsPartymemberByPhone(comPbMemberDO.getPhone());
}
-
- });
+ }
+ );
return R.ok();
}
--
Gitblit v1.7.1