From b4c46ebaab5ba31803bd3c75522e8cfd68a4656a Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 10 May 2023 13:28:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/ImportGeneralDTO.java  |  27 ++++++++++++++++++
 .../epmet/model/NeighborHoodInfoModel.java    |  12 ++++++++
 .../impl/IcNeighborHoodServiceImpl.java       |  21 ++++++++++++++
 .../resources/excel/neighbor_template.xlsx    | Bin 11674 -> 11413 bytes
 .../excel/neighbor_template_0510.xlsx         | Bin 0 -> 11674 bytes
 .../resources/mapper/IcNeighborHoodDao.xml    |  20 +++++++++++++
 6 files changed, 80 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template_0510.xlsx

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
index df0f6b0530..dca6c1244b 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
+++ b/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;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
index 63260ee190..b1f33f409b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java
+++ b/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;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index c253f154c5..55d7d172e5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/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);
         }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx
index 36297ea510f4e9d917b11d0da6106ac096d05a27..6cf2b7957e2ae12805b1ebea85d4c8c93c0b1585 100644
GIT binary patch
literal 11413
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
JE9B4G{|{5RXjA|I

literal 11674
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

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template_0510.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template_0510.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..36297ea510f4e9d917b11d0da6106ac096d05a27
GIT binary patch
literal 11674
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

literal 0
HcmV?d00001

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index ba7d250ba2..ce5737b3de 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/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'

From eaee037d039b7f1392c1926bb435475309b1354f Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 10 May 2023 13:47:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/excel/IcNeighborHoodExcel.java  |  13 +++++++++++++
 .../main/resources/excel/neighbor_export.xlsx | Bin 12931 -> 11704 bytes
 .../resources/excel/neighbor_export_0510.xlsx | Bin 0 -> 12931 bytes
 .../resources/mapper/IcNeighborHoodDao.xml    |   4 ++++
 4 files changed, 17 insertions(+)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export_0510.xlsx

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
index e9306fa5d7..227ed90e4a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java
+++ b/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;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx
index 2a1b3237d9de0b9f071d4c7ebfcc9fb0df6ef6cb..2d89d9255729ab7c6c41c736ad33386460df8c27 100644
GIT binary patch
literal 11704
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

literal 12931
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
AU;qFB

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export_0510.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export_0510.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..2a1b3237d9de0b9f071d4c7ebfcc9fb0df6ef6cb
GIT binary patch
literal 12931
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
AU;qFB

literal 0
HcmV?d00001

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index ce5737b3de..7f51133503 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -189,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,