Merge remote-tracking branch 'remotes/origin/dev_5big_coverage' 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>