新增党员的方法修改

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/impl/PartyMembersServiceImpl.java

@@ -21,8 +21,10 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum;
 import com.elink.esua.epdc.user.datasources.DataSourceNames;
 import com.elink.esua.epdc.user.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.user.service.PartyMembersService;
@@ -144,7 +146,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
      * 将必要的查询参数进行trim
      *
      * @param params 查询参数
-     * @return java.util.Map<java.lang.String   ,       java.lang.Object>
+     * @return java.util.Map<java.lang.String, java.lang.Object>
      * @author work@yujt.net.cn
      * @date 2020/2/24 16:43
      */
@@ -181,11 +183,11 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(PartyMembersDTO dto) {
-        List<PartyMembersEntity> partyMembersEntityList = baseDao.selectList(new QueryWrapper<PartyMembersEntity>());
+//        List<PartyMembersEntity> partyMembersEntityList = baseDao.selectList(new QueryWrapper<PartyMembersEntity>());
         // 去空格
-        List<PartyMembersExcel> partyList = new ArrayList<>();
+//        List<PartyMembersExcel> partyList = new ArrayList<>();
         // 校验数据
-        String message = this.checkExcelNew(dto, partyMembersEntityList);
+        String message = this.checkExcelNew(dto);
         if (StringUtils.isNotBlank(message)) {
             throw new RenException(message);
         }
@@ -233,24 +235,28 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         }
     }
 
-    private String checkExcelNew(PartyMembersDTO dto, List<PartyMembersEntity> partyMembersEntityList) {
+    private String checkExcelNew(PartyMembersDTO dto) {
         // 不匹配信息
         String result = null;
-        EpdcPartyErroyResultDTO errorLineinfoDto;
-            if (StringUtils.isBlank(dto.getRealName())) {
-                result = "姓名为空";
-            }
-            if (StringUtils.isBlank(dto.getIdentityNo())) {
-                result = "身份证号为空";
-            }
-            for (PartyMembersEntity item : partyMembersEntityList) {
-                if (StringUtils.isNotBlank(item.getMobile()) && item.getMobile().equals(dto.getMobile())) {
-                    result = "手机号已存在";
-                }
-                if (item.getIdentityNo().equals(dto.getIdentityNo())) {
-                    result = "身份证号已存在";
-                }
-            }
+        if (StringUtils.isBlank(dto.getRealName())) {
+            result = "姓名为空";
+        }
+        if (StringUtils.isBlank(dto.getIdentityNo())) {
+            result = "身份证号为空";
+        }
+        LambdaQueryWrapper<PartyMembersEntity> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(PartyMembersEntity::getDelFlag, EpdcDelFlagEnum.NORMAL.value())
+                .and(
+                        qw -> qw.eq(PartyMembersEntity::getIdentityNo, dto.getIdentityNo())
+                                .or()
+                                .eq(StringUtils.isNotBlank(dto.getMobile()), PartyMembersEntity::getMobile, dto.getMobile())
+                );
+
+        Integer selectCount = baseDao.selectCount(lqw);
+        if (selectCount > NumConstant.ZERO) {
+            result = "身份证号或手机号重复";
+        }
+
         return result;
     }
 
@@ -516,14 +522,14 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         List<PartyMembersEntity> entities = new ArrayList<>();
         for (PartyMembersDTO party : partyList) {
             PartyMembersEntity entity = new PartyMembersEntity();
-            if("grid_party".equals(dto.getTypeKey())) {
+            if ("grid_party".equals(dto.getTypeKey())) {
                 entity.setId(party.getId());
                 entity.setAllDeptIds(dto.getAllDeptIds());
                 entity.setAllDeptNames(dto.getAllDeptNames());
                 entity.setParentDeptIds(dto.getParentDeptIds());
                 entity.setParentDeptNames(dto.getParentDeptNames());
             }
-            if("community_party".equals(dto.getTypeKey())) {
+            if ("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(party.getAllDeptIdsStr().split(","));
                 List<String> allDeptNames = Arrays.asList(party.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
@@ -577,6 +583,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         }
 
     }
+
     @Override
     public List<PartyMembersDTO> optimizeHasAuthenticationPartyExport(Map<String, Object> params) {
         params.put("deptIdList", SecurityUser.getUser().getDeptIdList());