双实信息录入-小区、楼栋、房屋-新增/修改添加部分字段

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java

@@ -135,7 +135,20 @@ public class IcBulidingAddFormDTO implements Serializable {
      */
     private String buildingLeaderMobile;
 
+    /**
+     * 楼栋编码
+     */
+    private String coding;
 
+    /**
+     * 楼栋系统编码
+     */
+    private String sysCoding;
+
+    /**
+     * 实有人口数
+     */
+    private Integer realPerson;
 
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java

@@ -108,4 +108,9 @@ public class IcHouseAddFormDTO implements Serializable {
 
     private BigDecimal sort = NumConstant.ZERO_DECIMAL;
 
+    /**
+     * 房屋可编辑编码
+     */
+    private String coding;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java

@@ -99,7 +99,20 @@ public class IcNeighborHoodAddFormDTO extends PageFormDTO {
 	private String latitude;
 
 
+    /**
+     * 小区编码
+     */
+    private String coding;
 
+    /**
+     * 小区系统编码
+     */
+    private String sysCoding;
+
+    /**
+     * 实有楼栋数
+     */
+    private Integer realBuilding;
 
 
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseInfoResultDTO.java

@@ -103,4 +103,9 @@ public class HouseInfoResultDTO implements Serializable {
      * 备注
      */
     private String remark;
+
+    /**
+     * 房屋可编辑编码
+     */
+    private String coding;
 }

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

@@ -221,6 +221,7 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
     * @params [coding]
     * @return com.epmet.entity.IcBuildingEntity
     */
-    IcBuildingEntity selectByCoding(@Param("coding") String coding);
+    IcBuildingEntity selectByCoding(@Param("coding") String coding,
+                                    @Param("id") String id);
 
 }

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

@@ -109,5 +109,6 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     * @params [coding]
     * @return com.epmet.entity.IcNeighborHoodEntity
     */
-    IcNeighborHoodEntity selectByCoding(@Param("coding") String coding);
+    IcNeighborHoodEntity selectByCoding(@Param("coding") String coding,
+                                        @Param("id") String id);
 }

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

@@ -100,6 +100,13 @@ public class BuildingServiceImpl implements BuildingService {
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg());
         }
+        //楼栋编码不可重复
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
+            IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(formDTO.getCoding(),null);
+            if(null != isHaveCoding){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该楼栋编码已存在，请勿重复！","该楼栋编码已存在，请勿重复！");
+            }
+        }
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setCustomerId(customerId);
         IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
@@ -440,6 +447,13 @@ public class BuildingServiceImpl implements BuildingService {
                 throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(), "楼栋单元下存在房屋，无法更新");
             }
         }
+        //楼栋编码不可重复
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
+            IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(formDTO.getCoding(),formDTO.getBuildingId());
+            if(null != isHaveCoding){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该楼栋编码已存在，请勿重复！","该楼栋编码已存在，请勿重复！");
+            }
+        }
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setId(formDTO.getBuildingId());
         icBuildingDTO.setCustomerId(customerId);

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

@@ -137,7 +137,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
         }
-
+        //房屋编码不可重复
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
+            IcHouseEntity isHaveCoding = icHouseDao.selectByCoding(formDTO.getCoding());
+            if(null != isHaveCoding){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该房屋编码已存在，请勿重复！","该房屋编码已存在，请勿重复！");
+            }
+        }
         IcHouseEntity icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         icHouseDTO.setCustomerId(customerId);
         icHouseDTO.setHouseName(getHouseName(formDTO));

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

@@ -135,11 +135,11 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             Integer neighborMaxNum = Integer.valueOf(communEntity.getNeighborMaxNum()) + 1;
             //验证可编辑的编码是否有重复
             String neiCode = communResult.getCoding() + getNewMaxIndex(3, neighborMaxNum);
-            IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode);
+            IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode,null);
             while (null != isHaveCoding) {
                 neighborMaxNum++;
                 neiCode = communResult.getCoding() + getNewMaxIndex(3, neighborMaxNum);
-                isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode);
+                isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode,null);
             }
             //更新该社区下最大的小区编号
             communEntity.setNeighborMaxNum(getNewMaxIndex(3, neighborMaxNum));
@@ -186,11 +186,11 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             Integer buildingMaxNum = Integer.valueOf(buildingEntity.getBuildingMaxNum()) + 1;
             //验证可编辑的编码是否有重复
             String buildingCode = communResult.getCoding() + getNewMaxIndex(3, buildingMaxNum);
-            IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(buildingCode);
+            IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(buildingCode,null);
             while (null != isHaveCoding) {
                 buildingMaxNum++;
                 buildingCode = communResult.getCoding() + getNewMaxIndex(3, buildingMaxNum);
-                isHaveCoding = icBuildingDao.selectByCoding(buildingCode);
+                isHaveCoding = icBuildingDao.selectByCoding(buildingCode,null);
             }
             result.setCoding(buildingCode);
             result.setSysCoding(communResult.getSysCoding() + getNewMaxIndex(3, buildingMaxNum));

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

@@ -79,6 +79,13 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
         if (!customerAgencyResult.success()) {
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
+        //小区编码不可重复
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
+            IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(formDTO.getCoding(),null);
+            if(null != isHaveCoding){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该小区编码已存在，请勿重复！","该小区编码已存在，请勿重复！");
+            }
+        }
         CustomerAgencyDTO customerAgencyDTO =  Optional.ofNullable(customerAgencyResult.getData()).orElse(new CustomerAgencyDTO());
         icNeighborHoodDTO.setParentAgencyId(customerAgencyDTO.getPid());
         icNeighborHoodDTO.setAgencyPids(customerAgencyDTO.getPids());
@@ -128,7 +135,13 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
         }
-
+        //小区编码不可重复
+        if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
+            IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(formDTO.getCoding(),formDTO.getNeighborHoodId());
+            if(null != isHaveCoding){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该小区编码已存在，请勿重复！","该小区编码已存在，请勿重复！");
+            }
+        }
         IcNeighborHoodDTO icNeighborHoodDTO = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodDTO.class);
         icNeighborHoodDTO.setId(formDTO.getNeighborHoodId());
         icNeighborHoodDTO.setCustomerId(customerId);

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

@@ -444,6 +444,9 @@
         from ic_building
         where del_flag = '0'
               and CODING=#{coding}
+            <if test=" null != id and id != ''">
+                and id != #{id}
+            </if>
     </select>
 
 </mapper>

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

@@ -450,7 +450,8 @@
             a.OWNER_PHONE,
             a.OWNER_ID_CARD,
             a.REMARK,
-            c.AGENCY_PIDS
+            c.AGENCY_PIDS,
+            a.CODING
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'

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

@@ -327,5 +327,8 @@
         from ic_neighbor_hood
         where del_flag = '0'
               and CODING=#{coding}
+                <if test=" null != id and id != ''">
+                    and id != #{id}
+                </if>
     </select>
 </mapper>