From d01be9f1ec9a393818ea64deca3cbe7fa9372e08 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 23 六月 2021 18:21:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 0a0fd8a..aca0448 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
@@ -17,6 +17,7 @@
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.RichTextUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.*;
import com.panzhihua.service_dangjian.model.dos.*;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
@@ -141,6 +142,7 @@
if (!ObjectUtils.isEmpty(list)) {
List<PartyOrganizationVO> partyOrganizationVOArrayList=partyOrganizationVOS;
list.forEach(partyBuildingMemberExcelVO -> {
+
ComPbMemberDO comPbMemberDO=new ComPbMemberDO();
Date date=new Date();
comPbMemberDO.setUpdateAt(date);
@@ -153,21 +155,38 @@
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::getIdCard,partyBuildingMemberExcelVO.getIdCard())
+ .eq(ComPbMemberDO::getCommunityId,partyOrganizationVO.getCommunityId())
+ .in(ComPbMemberDO::getAuditResult,0,1));
+ if(!comPbMemberDOList.isEmpty()){
+ throw new PartyBuildingMemberException("导入失败，您导入的数据中有已存在的党员信息,已存在的数据:"+ partyBuildingMemberExcelVO.getEmploymentTime() + "，已存在的人名：" + partyBuildingMemberExcelVO.getName());
+ }
}
- if(!DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())){
+ if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime()) && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getEmploymentTime())){
throw new PartyBuildingMemberException("导入失败,您导入的数据中有转正日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getEmploymentTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
}
- if(!DateUtils.isValidDate(partyBuildingMemberExcelVO.getJoinTime())){
+ if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime()) && !DateUtils.isValidDate(partyBuildingMemberExcelVO.getJoinTime())){
throw new PartyBuildingMemberException("导入失败,您导入的数据中有入党日期格式错误，错误数据:" + partyBuildingMemberExcelVO.getJoinTime() + "，错误人名：" + partyBuildingMemberExcelVO.getName());
}
- Date employmentTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getEmploymentTime());
- Date joinTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getJoinTime());
+ if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getEmploymentTime())){
+ Date employmentTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getEmploymentTime());
+ comPbMemberDO.setEmploymentTime(employmentTime);
+ }else{
+ comPbMemberDO.setEmploymentTime(null);
+ }
- comPbMemberDO.setEmploymentTime(employmentTime);
- comPbMemberDO.setJoinTime(joinTime);
+ if(StringUtils.isNotEmpty(partyBuildingMemberExcelVO.getJoinTime())){
+ Date joinTime = DateUtils.toValidDate(partyBuildingMemberExcelVO.getJoinTime());
+ comPbMemberDO.setJoinTime(joinTime);
+ }else{
+ comPbMemberDO.setJoinTime(null);
+ }
+
comPbMemberDO.setName(partyBuildingMemberExcelVO.getName());
comPbMemberDO.setIdCard(partyBuildingMemberExcelVO.getIdCard());
comPbMemberDOS.add(comPbMemberDO);
--
Gitblit v1.7.1