Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -254,6 +254,11 @@ public class BuildingServiceImpl implements BuildingService {
                 icBuildingUnit.setUnitNum(String.valueOf(i+1));
                 unitList.add(icBuildingUnit);
             }
+            //同一小区下不能存在楼栋名字一样的
+            Integer count = icBuildingDao.checkBuildName(entity.getNeighborHoodId(),entity.getBuildingName(),null);
+            if (null != count && count > 0) {
+                throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(),EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
+            }
             icBuildingUnitEntityList.addAll(unitList);
         }
         //3.保存

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

@@ -165,6 +165,11 @@ public class HouseServiceImpl implements HouseService {
             entity.setOwnerName(icHouseExcel.getOwnerName());
             entity.setOwnerPhone(icHouseExcel.getOwnerPhone());
             entity.setOwnerIdCard(icHouseExcel.getOwnerIdCard());
+            //同一楼栋，单元内，房屋名称唯一
+            Integer count = icHouseDao.checkDoorNameUq(entity.getNeighborHoodId(), entity.getBuildingId(), entity.getBuildingUnitId(), entity.getDoorName(),null);
+            if (null != count && count > 0) {
+                throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
+            }
             houseEntityList.add(entity);
         }
         //3.保存

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

@@ -261,6 +261,12 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
         List<IcNeighborHoodEntity> neighborHoodEntityList = new ArrayList<>();
         List<IcNeighborHoodPropertyEntity> icNeighborHoodPropertyEntityList = new ArrayList<>();
         for (IcNeighborHoodExcel  icNeighborHoodExcel : list) {
+            //同一客户下，小区名称唯一
+            Integer count = icNeighborHoodDao.checkNameUq(customerId,icNeighborHoodExcel.getNeighborHoodName(),null);
+            if (null != count && count > 0) {
+                throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
+            }
+
             IcNeighborHoodEntity entity = new IcNeighborHoodEntity();
             String uuid  =UUID.randomUUID().toString().replace("-", "");
             entity.setId(uuid);