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

@@ -183,4 +183,31 @@ public class ImportGeneralDTO implements Serializable {
      */
     private Boolean buildingUpdateStatus = false;
     private Boolean neighborHoodUpdateStatus = false;
+
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageType;
+
+    /**
+     * 烟台需求：自然村/小区
+     */
+    private String viliageTypeName;
+    /**
+     * 烟台需求：面积
+     */
+    private String area;
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openType;
+
+    /**
+     * 烟台需求：开放类型
+     */
+    private String openTypeName;
+    /**
+     * 烟台需求：建筑年代
+     */
+    private String buildYear;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java

@@ -18,6 +18,7 @@
 package com.epmet.excel;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.epmet.util.ExcelVerifyInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
@@ -108,6 +109,18 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable
     @Length(max=50,message = "不能超过50个字")
     private String neighborHoodName;
 
+    @Excel(name = "小区/自然村类型")
+    private String viliageTypeName;
+
+    @Excel(name = "面积")
+    private String area;
+
+    @Excel(name = "开放类型")
+    private String openTypeName;
+
+    @Excel(name = "建筑年代")
+    private String buildYear;
+
     @Excel(name = "关联物业")
     private String propertyName;
 

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

@@ -21,6 +21,18 @@ public class NeighborHoodInfoModel {
     @ExcelProperty(value = "小区名称")
     private String neighborHoodName;
 
+    @ExcelProperty(value = "小区/自然村类型")
+    private String viliageTypeName;
+
+    @ExcelProperty(value = "面积")
+    private String area;
+
+    @ExcelProperty(value = "开放类型")
+    private String openTypeName;
+
+    @ExcelProperty(value = "建筑年代")
+    private String buildYear;
+
     @ExcelProperty(value = "关联物业")
     private String propertyName;
 

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

@@ -795,6 +795,27 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     @Override
     @Transactional
     public void updateNeighborHood(List<ImportGeneralDTO> needUpdateList) {
+
+        needUpdateList.forEach(
+                needUpdate->{
+                    if (StringUtils.isNotBlank(needUpdate.getOpenTypeName())){
+                        if (needUpdate.getOpenTypeName().equals("自然村")){
+                            needUpdate.setOpenType("2");
+                        }
+                        if (needUpdate.getOpenTypeName().equals("住宅小区")){
+                            needUpdate.setOpenType("1");
+                        }
+                    }
+                    if (StringUtils.isNotBlank(needUpdate.getViliageTypeName())){
+                        if (needUpdate.getViliageTypeName().equals("封闭式")){
+                            needUpdate.setViliageTypeName("1");
+                        }
+                        if (needUpdate.getViliageTypeName().equals("开放式")){
+                            needUpdate.setViliageTypeName("2");
+                        }
+                    }
+                });
+
         if (CollectionUtils.isNotEmpty(needUpdateList)){
             baseDao.updateNeighborHood(needUpdateList);
         }

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

@@ -39,6 +39,26 @@
                     when id = #{l.neighborHoodId} then #{l.remark}
                 </foreach>
             </trim>
+            <trim prefix="AREA =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when id = #{l.neighborHoodId} then #{l.area}
+                </foreach>
+            </trim>
+            <trim prefix="BUILD_YEAR =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when id = #{l.neighborHoodId} then #{l.buildYear}
+                </foreach>
+            </trim>
+            <trim prefix="VILIAGE_TYPE =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when id = #{l.neighborHoodId} then #{l.viliageType}
+                </foreach>
+            </trim>
+            <trim prefix="OPEN_TYPE =(case" suffix="end),">
+                <foreach collection="list" item="l">
+                    when id = #{l.neighborHoodId} then #{l.openType}
+                </foreach>
+            </trim>
             UPDATED_TIME = NOW()
         </trim>
         WHERE DEL_FLAG = '0'
@@ -169,6 +189,10 @@
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select
+        a.AREA as area,
+        a.BUILD_YEAR as buildYear,
+        if(a.VILIAGE_TYPE =1 ,'住宅小区',if(a.VILIAGE_TYPE = 2,'自然村','')) as viliageTypeName,
+        if(a.OPEN_TYPE =1 ,'封闭式',if(a.OPEN_TYPE = 2,'开放式','')) as openTypeName,
         a.NEIGHBOR_HOOD_NAME as neighborHoodName,
         a.ADDRESS as address,
         a.REMARK as remark,