From 9c8735c70d86a31081340ca78bb2b538ed11a6e5 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 27 七月 2021 18:39:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 a4571c2..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);
@@ -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