Merge branch 'yantai_zhengwu_master' into dev

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

@@ -165,4 +165,20 @@ public class IcNeighborHoodDTO implements Serializable {
      */
     private String buildingName;
 
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageType;
+    /**
+     * 烟台需求：面积
+     */
+    private String area;
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openType;
+    /**
+     * 烟台需求：建筑年代
+     */
+    private String buildYear;
 }

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

@@ -113,6 +113,21 @@ public class IcNeighborHoodAddFormDTO extends PageFormDTO {
      * 实有楼栋数
      */
     private Integer realBuilding;
-
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageType;
+    /**
+     * 烟台需求：面积
+     */
+    private String area;
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openType;
+    /**
+     * 烟台需求：建筑年代
+     */
+    private String buildYear;
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java

@@ -121,4 +121,21 @@ public class IcNeighborHoodEntity extends BaseEpmetEntity {
 	 * 二维码地址
 	 */
 	private String qrcodeUrl;
+
+	/**
+	 * 烟台需求：自然村/小区
+	 */
+	private String viliageType;
+	/**
+	 * 烟台需求：面积
+	 */
+	private String area;
+	/**
+	 * 烟台需求：开放类型
+	 */
+	private String openType;
+	/**
+	 * 烟台需求：建筑年代
+	 */
+	private String buildYear;
 }

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

@@ -121,7 +121,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
     @Override
     public PageData<IcPropertyManagementDTO> page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) {
         PageHelper.startPage(pageNo,pageSize);
-        List<IcPropertyManagementDTO> list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name);
+        List<IcPropertyManagementDTO> list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name,contactName,contactMobile);
         PageInfo<IcPropertyManagementDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal(),pageSize);
     }