Merge remote-tracking branches 'remotes/origin/dev_5big_coverage' and 'remotes/origin/dev_bugfix_ljj' into 烟台master

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java

@@ -24,4 +24,5 @@ public interface IcCityManagementDao extends BaseDao<IcCityManagementEntity> {
 
     void importInsert(@Param("entityList") List<IcCityManagementEntity> entityList);
 
+    void delByAgencyAndName(IcCityManagementEntity entity);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java

@@ -22,4 +22,6 @@ public interface IcDangerousChemicalsDao extends BaseDao<IcDangerousChemicalsEnt
     void del(IcDangerousChemicalsEntity entity);
 
     void importInsert(List<IcDangerousChemicalsEntity> entityList);
+
+    void delByAgencyAndName(IcDangerousChemicalsEntity entity);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java

@@ -23,4 +23,6 @@ public interface IcPublicServiceDao extends BaseDao<IcPublicServiceEntity> {
     void del(IcPublicServiceEntity entity);
 
     void importInsert(@Param("entityList") List<IcPublicServiceEntity> entityList);
+
+    void delByAgencyAndName(IcPublicServiceEntity entity);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java

@@ -23,4 +23,6 @@ public interface IcSuperiorResourceDao extends BaseDao<IcSuperiorResourceEntity>
     void del(IcSuperiorResourceEntity entity);
 
     void importInsert(@Param("entityList") List<IcSuperiorResourceEntity> entityList);
+
+    void delByAgencyAndName(IcSuperiorResourceEntity entity);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java

@@ -170,7 +170,10 @@ public class IcCityManagementServiceImpl extends BaseServiceImpl<IcCityManagemen
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcCityManagementAddEditFormDTO formDTO) {
-        IcCityManagementEntity entity = new IcCityManagementEntity();
+        IcCityManagementEntity entity = baseDao.selectById(formDTO.getIcCityManagementId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcCityManagementId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcDangerousChemicalsServiceImpl.java

@@ -185,7 +185,10 @@ public class IcDangerousChemicalsServiceImpl extends BaseServiceImpl<IcDangerous
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcDangerousChemicalsAddEditFormDTO formDTO) {
-        IcDangerousChemicalsEntity entity = new IcDangerousChemicalsEntity();
+        IcDangerousChemicalsEntity entity = baseDao.selectById(formDTO.getIcDangerousChemicalsId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcDangerousChemicalsId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPublicServiceServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.dto.result.IcCoverageCategoryDictListResultDTO;
 import com.epmet.dto.result.IcPublicServiceListResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.IcPublicServiceEntity;
+import com.epmet.entity.IcSuperiorResourceEntity;
 import com.epmet.excel.IcPublicServiceExcel;
 import com.epmet.excel.handler.IcPublicServiceExcelImportListener;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -170,7 +171,10 @@ public class IcPublicServiceServiceImpl extends BaseServiceImpl<IcPublicServiceD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcPublicServiceAddEditFormDTO formDTO) {
-        IcPublicServiceEntity entity = new IcPublicServiceEntity();
+        IcPublicServiceEntity entity = baseDao.selectById(formDTO.getIcPublicServiceId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcPublicServiceId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcSuperiorResourceServiceImpl.java

@@ -170,7 +170,10 @@ public class IcSuperiorResourceServiceImpl extends BaseServiceImpl<IcSuperiorRes
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(IcSuperiorResourceAddEditFormDTO formDTO) {
-        IcSuperiorResourceEntity entity = new IcSuperiorResourceEntity();
+        IcSuperiorResourceEntity entity = baseDao.selectById(formDTO.getIcSuperiorResourceId());
+        //先删除本组织先可能存在的名称相同的已经是无效的历史数据，为了表中的唯一索引不失效
+        baseDao.delByAgencyAndName(entity);
+        //再把当前数据置为无效数据
         entity.setId(formDTO.getIcSuperiorResourceId());
         entity.setUpdatedBy(formDTO.getUserId());
         baseDao.del(entity);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml

@@ -106,4 +106,15 @@
             id = #{id}
         AND del_flag = '0'
     </delete>
+
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_city_management
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml

@@ -118,4 +118,14 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_dangerous_chemicals
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml

@@ -107,4 +107,14 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_public_service
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 </mapper>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml

@@ -107,5 +107,15 @@
         AND del_flag = '0'
     </delete>
 
+    <delete id="delByAgencyAndName">
+        DELETE
+        FROM
+            ic_superior_resource
+        WHERE
+            del_flag != '0'
+        AND agency_id = #{agencyId}
+        AND `name` = #{name}
+    </delete>
+
 
 </mapper>

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -262,7 +262,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
 
     Map<String, String> getCategoryListMap(@Param("columns") List<String> columns, @Param("icUserId") String icUserId);
 
-    Map<String, String> selectResiInfoMap(@Param("idCard") String idCard, @Param("resiId") String resiId);
+    Map<String, String> selectResiInfoMap(@Param("customerId") String customerId, @Param("idCard") String idCard, @Param("resiId") String resiId);
 
     List<Map<String, Object>> selectResiUsers(@Param("types") List<String> types, @Param("orgId") String orgId);
 
@@ -394,18 +394,19 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                        @Param("customerId") String customerId);
 
     /**
+     * @return com.epmet.entity.IcResiUserEntity
      * @describe: 通过身份证号查询实体类
      * @author wangtong
      * @date 2022/6/13 17:32
      * @params [idCard, customerId]
-    * @return com.epmet.entity.IcResiUserEntity
      */
-    IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard,@Param("customerId")  String customerId);
+    IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId);
 
     List<IcResiUserDTO> getListIcResiUserDTO(@Param("icResiUserIdList") List<String> icResiUserIdList);
 
     /**
      * desc:获取客户内 每个房屋内的居民数
+     *
      * @param customerId
      * @return
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -462,7 +462,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 //默认新增
                 columnAndValues.put("SUB_STATUS", IcResiUserSubStatusEnum.IMPORT.getSubStatus());
                 String idCard = columnAndValues.get("ID_CARD");
-                Map<String, String> existingResiMap = icResiUserDao.selectResiInfoMap(idCard, null);
+                Map<String, String> existingResiMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null);
 
                 if (existingResiMap == null) {
                     // 新导入的居民，因为还没有读取子sheet，所以这些居民类别没有办法获取，先默认设置成0，后面读取子sheet的时候再更新
@@ -705,7 +705,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 }
 
                 // 检查用户是否存在
-                Map<String, String> existResiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null);
+                Map<String, String> existResiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null);
 
                 if (existResiInfoMap == null || existResiInfoMap.size() == 0) {
                     throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard));
@@ -790,7 +790,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                         "身份证号未填写");
             }
 
-            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null);
+            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null);
 
             if (resiInfoMap == null || resiInfoMap.size() == 0) {
                 throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard));
@@ -1654,7 +1654,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             Map<String, String> oldCategories = oldData.getCategories();
             Map<String, String> newCategories = newData.getCategories();
 
-            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId);
+            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId);
 
             fillResiSubCategoryInfo4TransferAndCategoryChange(oldData, newData, resiInfoMap);
 
@@ -1785,7 +1785,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         for (Map.Entry<String, ResiImportChangedData> resi : transferedResis.entrySet()) {
 
             String resiId = resi.getKey();
-            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId);
+            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId);
             String resiName = resiInfoMap.get("NAME");
             String pids = resiInfoMap.get("PIDS");
 

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -716,7 +716,8 @@
     <select id="selectResiInfoMap" resultType="java.util.Map">
         select * from ic_resi_user
         <where>
-            DEL_FLAG='0'
+            CUSTOMER_ID = #{customerId}
+            AND DEL_FLAG='0'
             <if test="idCard != null and idCard != ''">
                 AND ID_CARD=#{idCard}
             </if>