From db819d6bccdddc6f7990184a707ef80fe0857123 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 25 Nov 2021 10:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82=EF=BC=9A?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/IcResiUserDao.java     |  6 +++++
 .../service/impl/IcResiUserServiceImpl.java   | 27 ++++++++++++++++---
 .../main/resources/mapper/IcResiUserDao.xml   | 13 +++++++++
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
index 9897d01be7..81cd7bf54e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.ResiUserQueryValueDTO;
 import com.epmet.dto.result.IcFormResColumnDTO;
 import com.epmet.dto.result.PersonDataResultDTO;
@@ -145,4 +146,9 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
     Map<String,String> selectPersonType(@Param("columns")List<String> columns,@Param("customerId")String customerId,
                                         @Param("tableName")String tableName,@Param("userId")String userId);
 
+    /**
+     * @Author sun
+     * @Description 查询居民信息
+     **/
+    IcResiUserDTO getResiUser(IcResiUserDTO dto);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 8b73150513..26d9810d03 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -49,10 +49,7 @@ import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.constant.UserConstant;
 import com.epmet.dao.IcResiUserDao;
-import com.epmet.dto.CustomerAgencyDTO;
-import com.epmet.dto.IcHouseDTO;
-import com.epmet.dto.IcNeighborHoodDTO;
-import com.epmet.dto.IcResiCategoryStatsConfigDTO;
+import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
 import com.epmet.dto.result.*;
@@ -169,6 +166,17 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if(!map.containsKey("AGENCY_ID")){
                     throw new RenException("新增居民信息--入参AGENCY_ID为空");
                 }
+                //2021.11.25 新增需求 客户下身份证号唯一  start
+                if (map.containsKey("ID_CARD")) {
+                    IcResiUserDTO dto = new IcResiUserDTO();
+                    dto.setCustomerId(tokenDto.getCustomerId());
+                    dto.setIdCard(map.get("ID_CARD"));
+                    IcResiUserDTO userDTO = baseDao.getResiUser(dto);
+                    if (null != userDTO && null != userDTO.getIdCard()) {
+                        throw new RenException("新增居民信息失败，身份证号已存在!");
+                    }
+                }
+                //2021.11.25  end
                 //查询组织信息
                 String agencyId = map.get("AGENCY_ID");
                 Result<CustomerAgencyDTO> result = govOrgOpenFeignClient.getAgencyById(agencyId);
@@ -216,6 +224,17 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if (!map.containsKey("ID")) {
                     throw new RenException(String.format("居民信息修改-居民信息表主键值为空"));
                 }
+                //2021.11.25 新增需求 客户下身份证号唯一  start
+                if (map.containsKey("ID_CARD")) {
+                    IcResiUserDTO dto = new IcResiUserDTO();
+                    dto.setCustomerId(tokenDto.getCustomerId());
+                    dto.setIdCard(map.get("ID_CARD"));
+                    IcResiUserDTO userDTO = baseDao.getResiUser(dto);
+                    if (null != userDTO && null != userDTO.getIdCard()) {
+                        throw new RenException("修改居民信息失败，身份证号已存在!");
+                    }
+                }
+                //2021.11.25  end
                 resiUserId = map.get("ID");
             }
         }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 712e78ed81..5f23694620 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -271,4 +271,17 @@
             AND IC_RESI_USER = #{userId}
         </if>
     </select>
+    <select id="getResiUser" resultType="com.epmet.dto.IcResiUserDTO">
+        SELECT
+            id,
+            `name`,
+            id_card,
+            mobile
+        FROM
+            ic_resi_user
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND id_card = #{idCard}
+    </select>
 </mapper>