From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 aca0448..c89e282 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
@@ -141,8 +141,7 @@
List<ComPbMemberDO> comPbMemberDOS=new ArrayList<>();
if (!ObjectUtils.isEmpty(list)) {
List<PartyOrganizationVO> partyOrganizationVOArrayList=partyOrganizationVOS;
- list.forEach(partyBuildingMemberExcelVO -> {
-
+ for (PartyBuildingMemberExcelVO partyBuildingMemberExcelVO:list) {
ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
Date date=new Date();
comPbMemberDO.setUpdateAt(date);
@@ -150,7 +149,7 @@
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());
+ throw new PartyBuildingMemberException("导入失败，组织不存在"+partyBuildingMemberExcelVO.getOrgName() + "，请先在“党支部管理”中添加该党支部");
}else{
PartyOrganizationVO partyOrganizationVO = collect.get(0);
comPbMemberDO.setOrgId(partyOrganizationVO.getId());
@@ -161,7 +160,12 @@
.eq(ComPbMemberDO::getCommunityId,partyOrganizationVO.getCommunityId())
.in(ComPbMemberDO::getAuditResult,0,1));
if(!comPbMemberDOList.isEmpty()){
- throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+ partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" + partyBuildingMemberExcelVO.getName());
+ comPbMemberDOList.forEach(comPbMember -> {
+ BeanUtils.copyProperties(partyBuildingMemberExcelVO,comPbMember);
+ this.baseMapper.updateById(comPbMember);
+ });
+ continue;
+// throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+ partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" + partyBuildingMemberExcelVO.getName());
}
}
@@ -190,7 +194,7 @@
comPbMemberDO.setName(partyBuildingMemberExcelVO.getName());
comPbMemberDO.setIdCard(partyBuildingMemberExcelVO.getIdCard());
comPbMemberDOS.add(comPbMemberDO);
- });
+ }
}
this.saveBatch(comPbMemberDOS);
return R.ok();
--
Gitblit v1.7.1