From 2ac9f2efa945e4bc1708c593704e3e32f4f4f252 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jun 2022 09:10:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8A=BF=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E3=80=81=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=E3=80=81=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E5=8D=B1=E5=8C=96=E3=80=81=E5=85=AC=E5=85=B1=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=AF=BC=E5=85=A5=E6=97=B6=E5=90=8C=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=8B=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80=EF=BC=8C=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E7=9B=B4=E6=8E=A5=E6=9B=B4=E6=96=B0?= =?UTF-8?q?,=E6=9C=AA=E6=94=B9=E5=BD=BB=E5=BA=95=EF=BC=8C=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcCityManagementDao.java | 1 + .../java/com/epmet/dao/IcDangerousChemicalsDao.java | 2 ++ .../main/java/com/epmet/dao/IcPublicServiceDao.java | 2 ++ .../java/com/epmet/dao/IcSuperiorResourceDao.java | 2 ++ .../service/impl/IcCityManagementServiceImpl.java | 5 ++++- .../service/impl/IcDangerousChemicalsServiceImpl.java | 5 ++++- .../service/impl/IcPublicServiceServiceImpl.java | 6 +++++- .../service/impl/IcSuperiorResourceServiceImpl.java | 5 ++++- .../src/main/resources/mapper/IcCityManagementDao.xml | 11 +++++++++++ .../main/resources/mapper/IcDangerousChemicalsDao.xml | 10 ++++++++++ .../src/main/resources/mapper/IcPublicServiceDao.xml | 10 ++++++++++ .../main/resources/mapper/IcSuperiorResourceDao.xml | 10 ++++++++++ 12 files changed, 65 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java index b22f9734c6..fb9664fa0d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcCityManagementDao.java @@ -24,4 +24,5 @@ public interface IcCityManagementDao extends BaseDao { void importInsert(@Param("entityList") List entityList); + void delByAgencyAndName(IcCityManagementEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java index 5f75264465..cd0758a98f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcDangerousChemicalsDao.java @@ -22,4 +22,6 @@ public interface IcDangerousChemicalsDao extends BaseDao entityList); + + void delByAgencyAndName(IcDangerousChemicalsEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java index 3f29ecba64..d7ac4b6ef1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPublicServiceDao.java @@ -23,4 +23,6 @@ public interface IcPublicServiceDao extends BaseDao { void del(IcPublicServiceEntity entity); void importInsert(@Param("entityList") List entityList); + + void delByAgencyAndName(IcPublicServiceEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java index cbd187c7bf..361cc8c5bf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcSuperiorResourceDao.java @@ -23,4 +23,6 @@ public interface IcSuperiorResourceDao extends BaseDao void del(IcSuperiorResourceEntity entity); void importInsert(@Param("entityList") List entityList); + + void delByAgencyAndName(IcSuperiorResourceEntity entity); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java index 0562ff6f1e..a8edb5e7cd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcCityManagementServiceImpl.java +++ b/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 + + + DELETE + FROM + ic_city_management + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml index ccaea77ffd..99d3138558 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcDangerousChemicalsDao.xml @@ -118,4 +118,14 @@ AND del_flag = '0' + + DELETE + FROM + ic_dangerous_chemicals + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 6909d9ea5c..295ee69e36 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -107,4 +107,14 @@ AND del_flag = '0' + + DELETE + FROM + ic_public_service + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml index 0b9d9760f4..8058120afd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcSuperiorResourceDao.xml @@ -107,5 +107,15 @@ AND del_flag = '0' + + DELETE + FROM + ic_superior_resource + WHERE + del_flag != '0' + AND agency_id = #{agencyId} + AND `name` = #{name} + + \ No newline at end of file From a81fe11a3e47c210a49c84eb8ff8313fb8f31194 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 30 Jun 2022 14:39:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcResiUserDao.java | 17 +++++++++-------- .../impl/IcResiUserImportServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/IcResiUserDao.xml | 3 ++- 3 files changed, 16 insertions(+), 14 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 9babaf57fc..0a83b820c1 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 @@ -262,7 +262,7 @@ public interface IcResiUserDao extends BaseDao { Map getCategoryListMap(@Param("columns") List columns, @Param("icUserId") String icUserId); - Map selectResiInfoMap(@Param("idCard") String idCard, @Param("resiId") String resiId); + Map selectResiInfoMap(@Param("customerId") String customerId, @Param("idCard") String idCard, @Param("resiId") String resiId); List> selectResiUsers(@Param("types") List types, @Param("orgId") String orgId); @@ -394,18 +394,19 @@ public interface IcResiUserDao extends BaseDao { @Param("customerId") String customerId); /** - * @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); + * @return com.epmet.entity.IcResiUserEntity + * @describe: 通过身份证号查询实体类 + * @author wangtong + * @date 2022/6/13 17:32 + * @params [idCard, customerId] + */ + IcResiUserEntity selectResiUserEntityByIdCard(@Param("idCard") String idCard, @Param("customerId") String customerId); List getListIcResiUserDTO(@Param("icResiUserIdList") List icResiUserIdList); /** * desc:获取客户内 每个房屋内的居民数 + * * @param customerId * @return */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index fc0b35888e..fce74a839e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/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 existingResiMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map existingResiMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null); if (existingResiMap == null) { // 新导入的居民，因为还没有读取子sheet，所以这些居民类别没有办法获取，先默认设置成0，后面读取子sheet的时候再更新 @@ -705,7 +705,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res } // 检查用户是否存在 - Map existResiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map 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 resiInfoMap = icResiUserDao.selectResiInfoMap(idCard, null); + Map 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 oldCategories = oldData.getCategories(); Map newCategories = newData.getCategories(); - Map resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId); fillResiSubCategoryInfo4TransferAndCategoryChange(oldData, newData, resiInfoMap); @@ -1785,7 +1785,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res for (Map.Entry resi : transferedResis.entrySet()) { String resiId = resi.getKey(); - Map resiInfoMap = icResiUserDao.selectResiInfoMap(null, resiId); + Map resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId); String resiName = resiInfoMap.get("NAME"); String pids = resiInfoMap.get("PIDS"); 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 711505d7ea..b693502628 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 @@ -716,7 +716,8 @@