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/ImportGeneralDTO.java

@@ -210,4 +210,10 @@ public class ImportGeneralDTO implements Serializable {
      * 烟台需求：建筑年代
      */
     private String buildYear;
+
+    /**
+     * 所在楼层
+     */
+    private String floor;
+
 }

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

@@ -89,5 +89,9 @@ public class IcHouseListResultDTO implements Serializable {
      */
     private String houseCode;
 
+    private String area;
+
+    private String floor;
+
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/HouseInfoModel.java

@@ -37,6 +37,12 @@ public class HouseInfoModel {
     @ExcelProperty(value = "房屋类型")
     private String houseType;
 
+    @ExcelProperty(value = "所在楼层")
+    private String floor;
+
+    @ExcelProperty(value = "面积（平方米）")
+    private String area;
+
     @ExcelProperty(value = "房屋用途")
     private String purpose;
 

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

@@ -798,20 +798,20 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
 
         needUpdateList.forEach(
                 needUpdate->{
-                    if (StringUtils.isNotBlank(needUpdate.getOpenTypeName())){
-                        if (needUpdate.getOpenTypeName().equals("自然村")){
-                            needUpdate.setOpenType("2");
+                    if (StringUtils.isNotBlank(needUpdate.getViliageTypeName())){
+                        if (needUpdate.getViliageTypeName().equals("自然村")){
+                            needUpdate.setViliageType("2");
                         }
-                        if (needUpdate.getOpenTypeName().equals("住宅小区")){
-                            needUpdate.setOpenType("1");
+                        if (needUpdate.getViliageTypeName().equals("住宅小区")){
+                            needUpdate.setViliageType("1");
                         }
                     }
-                    if (StringUtils.isNotBlank(needUpdate.getViliageTypeName())){
-                        if (needUpdate.getViliageTypeName().equals("封闭式")){
-                            needUpdate.setViliageTypeName("1");
+                    if (StringUtils.isNotBlank(needUpdate.getOpenTypeName())){
+                        if (needUpdate.getOpenTypeName().equals("封闭式")){
+                            needUpdate.setOpenType("1");
                         }
-                        if (needUpdate.getViliageTypeName().equals("开放式")){
-                            needUpdate.setViliageTypeName("2");
+                        if (needUpdate.getOpenTypeName().equals("开放式")){
+                            needUpdate.setOpenType("2");
                         }
                     }
                 });

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

@@ -62,6 +62,16 @@
                     when id = #{h.houseId} then #{h.ownerIdCard}
                 </foreach>
             </trim>
+            <trim prefix="FLOOR =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.floor}
+                </foreach>
+            </trim>
+            <trim prefix="AREA =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.area}
+                </foreach>
+            </trim>
             <trim prefix="SORT =(case" suffix="end),">
                 <foreach collection="houses" item="h">
                     when id = #{h.houseId} then #{h.sort}
@@ -104,6 +114,8 @@
         a.OWNER_PHONE as ownerPhone,
         a.OWNER_ID_CARD as ownerIdCard,
         a.HOUSE_CODE,
+        a.FLOOR as floor,
+        a.AREA as area,
 
         a.ID as houseId,
         c.ID as neighborHoodId,