双实信息录入-楼栋新增/修改调整地址字段

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

@@ -110,7 +110,7 @@ public class IcBulidingAddFormDTO implements Serializable {
      * 坐标位置
      */
 
-    private String location;
+    private String coordinatePosition;
 
 
     /**

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

@@ -81,7 +81,7 @@ public class IcBulidingDetailDTO implements Serializable {
      * 坐标位置
      */
 
-    private String location;
+    private String coordinatePosition;
 
 
     /**

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

@@ -134,11 +134,11 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         } else {
             Integer neighborMaxNum = Integer.valueOf(communEntity.getNeighborMaxNum()) + 1;
             //验证可编辑的编码是否有重复
-            String neiCode = communResult.getCoding() + getNewMaxIndex(3, neighborMaxNum);
+            String neiCode = getCompleteAreaCode(communResult.getAreaCode()) + getNewMaxIndex(3, neighborMaxNum);
             IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode,null);
             while (null != isHaveCoding) {
                 neighborMaxNum++;
-                neiCode = communResult.getCoding() + getNewMaxIndex(3, neighborMaxNum);
+                neiCode = getCompleteAreaCode(communResult.getAreaCode()) + getNewMaxIndex(3, neighborMaxNum);
                 isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode,null);
             }
             //更新该社区下最大的小区编号

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

@@ -415,6 +415,7 @@
             h.NEIGHBOR_HOOD_NAME,
 			b.LATITUDE,
 			b.LONGITUDE,
+			b.COORDINATE_POSITION,
 			b.TYPE,
             h.GRID_ID,
             h.AGENCY_ID,