From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:05:28 +0800
Subject: [PATCH] 三说会堂事件流程处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
index 950f63f..c070136 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
@@ -81,9 +81,9 @@
BeanUtils.copyProperties(addClusterMemberAdminDto,organizationMemberDO);
organizationMemberDO.setCreateAt(new Date());
if(this.baseMapper.insert(organizationMemberDO) > 0){
- return R.ok();
+ return R.ok("添加成功");
}
- return R.fail();
+ return R.fail("添加失败");
}
/**
@@ -109,9 +109,9 @@
BeanUtils.copyProperties(editClusterMemberAdminDto,organizationMemberDO);
organizationMemberDO.setUpdateAt(new Date());
if(this.baseMapper.updateById(organizationMemberDO) > 0){
- return R.ok();
+ return R.ok("编辑成功");
}
- return R.fail();
+ return R.fail("编辑失败");
}
/**
@@ -126,9 +126,9 @@
organizationMemberDO.setIsDel(ComClusterOrganizationMemberDO.isOk.yes);
organizationMemberDO.setUpdateAt(new Date());
if(this.baseMapper.updateById(organizationMemberDO) > 0){
- return R.ok();
+ return R.ok("删除成功");
}
- return R.fail();
+ return R.fail("删除失败");
}
/**
@@ -205,13 +205,19 @@
if(!isOnly(memberExcel.getIdCard(),memberMap)){
ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
- memberExcelErrorVO.setError("该成员已存在");
+ //判断该成员是否是已存在还是身份证号码重复
+ ComClusterOrganizationMemberDO memberDO = (ComClusterOrganizationMemberDO)memberMap.get(memberExcel.getIdCard());
+ if(memberDO.getName().equals(memberExcel.getName())){
+ memberExcelErrorVO.setError("该成员已存在");
+ }else{
+ memberExcelErrorVO.setError("身份证号重复");
+ }
mistakes.add(memberExcelErrorVO);
continue;
}
//判断组织是否存在
- if(!isOnly(memberExcel.getClusterName(),clusterMap)){
+ if(isOnly(memberExcel.getClusterName(),clusterMap)){
ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
memberExcelErrorVO.setError("该组织在本社区不存在");
@@ -223,7 +229,7 @@
}
//判断民族是否存在
- if(!isOnly(memberExcel.getNation(),nationMap)){
+ if(isOnly(memberExcel.getNation(),nationMap)){
ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
memberExcelErrorVO.setError("您填写的民族不存在");
@@ -239,6 +245,7 @@
clusterMember.setNationCode(nationCode);
clusterMember.setImageUrl(Constants.CLUSTER_MEMBER_DEFAULT_IMAGE_URL);
clusterMember.setCreateAt(nowDate);
+ clusterMember.setCommunityId(communityId);
saveList.add(clusterMember);
memberMap.put(clusterMember.getIdCard(),clusterMember);
}
--
Gitblit v1.7.1