Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master

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

@@ -28,4 +28,12 @@ public class IcNeighborHoodResultDTO extends PageFormDTO {
     private String propertyId;
     private String agencyName;
     private String longitude;
+
+    private String viliageTypeName;
+
+    private String area;
+
+    private String openTypeName;
+
+    private String buildYear;
 }

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

@@ -130,7 +130,11 @@
             d.PROPERTY_ID as propertyId ,
             a.LOCATION as location,
             a.LONGITUDE as longitude,
-            a.LATITUDE as latitude
+            a.LATITUDE as latitude,
+            a.AREA as area,
+            a.BUILD_YEAR as buildYear,
+            if(a.VILIAGE_TYPE = 1,'住宅小区',if(a.VILIAGE_TYPE = 1,'自然村','')) as viliageTypeName,
+            if(a.OPEN_TYPE = 1,'封闭式',if(a.OPEN_TYPE = 1,'开放式','')) as openTypeName
 
         from ic_neighbor_hood a
         left join customer_agency b  on a.AGENCY_ID = b.ID and b.DEL_FLAG='0'