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] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5=E5=AF=BC?=
 =?UTF-8?q?=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
zcmeHtbyQVr*YB3@kOt}6bVvzEcSv_gckK;GNFxn`goJdbbT<e{gLJoaNlD+W=e(ci
zaQw!&<K92tv;J6X!&-BW=b6v^%~q6!hQS8F0T2KH068GR=)~3c5de?^2LNCJ5TJBK
z?d_aQ?VMh!x;dCS>M^_8+K^?!KmpSMP>}Ecz5a_OFre0N)yay{gm;B5F=fOcoe}$(
zHb~&DZTdDmaFUm+oH}D6yLZW@gdf-?kHA)i$5Qjkyu0y>1&{ueS`}1e4rjp@?Q=}u
z-eTrKejL)V`0x5+QhgR`TF?d4fY9TuD=VG_p0?m3)Z9!mFuJmlx=;ygIT}jo`s7sT
z_le;gl^KyiVKnz<zC<li17I$kXn3GPRFSFp=t+{GeVl8)qFChIr$7drzWTxe>~iIL
z_A7YVCS$2O_H_d#-X=o=ks5XmhE}Y-oy9uNmT?UE*gOrjN|gGK>v?BkiPd52JW^pY
zA2v<lX3hGO_@dHJ(m8Mesv6S4(j_vLQ=V@Gsj^Tqmdc~P-a{QF^1|JV_3V>wlP%tp
zb)I~C2a|vWEi|j@qi5d<a1X6lBst}Cdlfna>(L{S;XfYEM<%*;g%2}geB<$!c9GXa
z^2Ff|`~3ZcYR_BWHWftpF)O|sc!^h?VLfOOOI9PBU~^e2otJX00hZ+PD_{ao2tM!c
zp#h42LoSwnizyW3%@PEd$Pnbd1e@A8vM~R+|BKlFVwnDA>&4OXve0Z8frozg<O9uo
zbMzEnY*@s%<V|iLu_fLba3@A(H{4!G2s>rekhmw8x}>@#o|#o-xn^O!e)aghIHF&&
z*;u1`hwN=#9Xw_XSR!Iis>7GUrf|3D>}dr3M#l7+Kxpx5<{M_}dmnsfN%bzj=k>al
zJeqM}eC<;i^g?RgxDDdKB|^nPj;<jo1U^UTOo8uBmrY#U@}-vj?)JSolnhb1Vnb0{
z-=k(kc1}1m)iZLa+RME9wuAewDU6{>Xti(CwhpaFm6au^1CpRqzFzL}z*aS7i#uX@
z&nHTFY_c}7qvvVbvGitMu$4bI9?}@*emt~TaRrgWKOvL8^{t*C8URRw2LR9^U%1+^
zxY&cOjqL5Me>l2qwK=;v9t_Wy2KU0tjhT(c$nV0YL(AYQ!qVkq@E*a5j^Y}Ij7P_o
zkZrZP0CnDC;fc=@viGipqiuo%8?MGD;;M6$+1jzz_3A!nCI|Z+JNvaPnxErq$r$S|
z%Qz&Zn-`AcZ7+H2?Z27lM=UP~_!Pm!X>*sa0hPZH79o!+q9w&eaZZx;Rc8@OgEC}f
zob{fy?7mGVeERkrq5K9RP_qO-qkzm-zJAePO4|_ipeUNtN~ow;a@mTJ+twIMi5qbI
zi9R>&wW7%cm40!3)b|3vGCr0HUc_O9I})mbNZ!ExN@FXDY(=9S7Qo~Tp9gN^CU5Em
z&CLP-T_kzH+iV@P9hXy?w_amKqnOsGNMGx{!{G=%=$B}Ulb*{}I*i=}S;tHxY2m0}
z<r*a6A~wJ%?QMNPo#Co{ua<t+$?EX#>GO)i7uto`jj&6)j?7NO{xD}Wify|xD!t{o
zj_sUB8;aF}8{MZ!Wt%ww8tt_0d!`s{LO>lrxFc9PJZ+qKGH0TXUf44EgP9U44M!f%
z8qu|womHW&a!5@Xa)Tawg^kZpu08mwkgwQUsS0Os%E($&61B1<{|)X?998{x{*xQb
z5-Qb=D$1%pg{{!x>s362un_4MM-=Z?uQapIe&O)Si<Xw{?(Y^w;#!xP#-GgQ@i-kp
zh3>%0zA$;x@R3ie1;+C0@TRayqcCfYsJ%c<srg+svDo%{H>xsAf2KV~)RQi;W%YP?
z8G`RH0c~kdCtB->I8upfi(Q>JVA1xyYY3K5{SQ7M&dxidhaZeHT!vdXM~34W#iwJk
zj=7Ui-G6}vP3@9sWyq4*ufNDNJS6R#q~_Uk!*EF(kAc48dyKYY9(ED&t!w@RiEg*q
z!B`+8!PC!ay4b10JeB7P#fF|$=iU~?$(o&47R0BEsLYtUm=?TG&tAMST$k+jdv&G0
z?FBbm3DZ1~c|3qh(?V>f4;PnQcW%Rlv=1Eg+xjBA$*p8YZ`nc$GRM$pbsG&&xw8#*
zMjq$Zo9-_ssO&rdIaV+6WS^m4t_>F;ZXBHtqf`c=6D}^!vyfH_1PD6y`8EmTq0Tr4
z4)2`u{T678h_}EWzG)l+HbMZxBM8v`a8G}Q+kafuBS>%w`S!p2YKj?#1Xn2ChyKm}
zqn@B>JJVR+=5XOsoeKbs((1@3uJ`A(_JT2@4MM%l8F>CwH=cqcdABQhhoA7^tWwmX
zsOb=@a*DL)fZutV1^E5RCTqT=ROTB9`H6zOYrQ*PINpfmo>66nQo{z$9A;;KF({=2
zk=Q1WGoL0I6A*4YyG^3@@ypk;-%R)z<<h;4^K&TXB75N<IdpH`*kC8?0opK+d|#^h
z*&c7m1mjug&IlPpf;Lr8FHOiNveM3V?!ex7g9@Tf6Is?dPQ%YzJ`;RF2_g-}R+IXE
zZrV73LCk?(NGK6!(YI?!=T8(6Sq_ZpdR%6Mk{67Qk$-2Zp@9sG*O17D5f%Wzhp5J%
zrrOcM)YQq5<>!O#hs_R;9(=LOiV<+3u}aK%7=i^1mXODUQX|vUU4VK$mB^uPt5Bvl
zdvxluSBOwR#1-Prv6TF*r*f{Da}Ud7WQ$NAhuVA@yJoh8=<d9Mr*(x<Y+KuMM7UED
z;pUasxp|FfE8=q@6ETO370+-{CNah5ngmEs+D7Gr7W<@hT5%1J$mVoSBI<zs)`mH+
zZiMo0?eV9bwcDW!OJMQPG0-I>zL2^<e?vJ~xU^h+`eEPU;|SUtP0Oscgp6b@HNg^M
z_j-1Yi<TrQXOqoA#6_zOHUm85ju8KmvBW$h`e2T<>LePeny2V`ori_)N+7m0Q}0F2
zy^cuEFmN>tG`)x{8|Xa1B3_12GZ#gFJ$No5bgLp8MTM8)lRU3`W@t2Fpl%wW49*$t
zygwVN_lrl~CWuwpcdI&W!)HnZ6q}b*mAJh1oX4aGB*LZFQW3OWT{v2?$%S*rkNh%&
z^IeqmsLMn|v9H*R#&jsdHd61V;<>Sui|3}fJ(5!A5}pj31?!%Y{y0C#5#8ULj4UAe
zv!cK*YtXs*Ok7nWOCvW7T>$kAHS7{H5BBj4<zx;-hFsoZWt+>)1U-4eTq@6mivn~H
zN_5>RO@B2OI4vk3pd{y5qo^kbkG5tQ1g(=V3=(S6(+hBS&R<gqS58o#&(4=!$+3_D
z#b+{gQHfvRB^8|vZnCueT)@wplOmfP1WGqZ?eH9<1{_SQjHpN^2pD9d=3Ti=nIC~8
za$#T3au&$8mE{}OLR|8krK5Z6o&lYrZKo#jG4>i2Bee9XyrbVT65xGs4tc(xb)GDV
zpI=EBj~<ER2TrqV%N}5OVMIfE!l`5<P3w%)VWqVYspCv>zI3$XM#YB*ERQ0&Ty0Oq
z5KF8OKe6D%RT}#o7?s@W8p&gW+(_xSdEw5z$KbuzG}OX+6}&k8MLkK26#n2uO!vc!
zY{3dw!Yzym35)gQX1g{)#;vE<Q`;X=W86XUeBU2?l48BH_4>KXhv|Sem)bWL2w>bH
zCii~<4Es;OjOtl;uwuh4U$@_her}d$;5D<1V|$0#i0?=`#rDkBU;2gg7t4#?c=b2F
z+>0A0(u<Cv6TKGSpobW$s0X8CAD2PpR5(iu3Ub9r%6KfRgClTdX8rSuHg5GmVlGFh
zLS#y1E!px2wnGVcsQ3q1HtpRhNGU7iFZ2dIc76JfqepF$a?uAIOt-Z@FEGKW$2~5S
z7$qoM3FjH%|8##XQGJ(5075pe<8#^<OShyf*U%2|5~E|ISenEoUfNB#jvcJ4n_gQF
z<(A<&)eN8l@7;{<4j|VUC~4y=cfp9xg!mU`D-f9W8!-;W`(@p8)3gSg(bfenC?07n
z8si0umK$2yOpk;<Up3U6?TgO!|MW3`a5|J*l1jB{Y=z*gHadfD+fRRT@%TGbp`A#!
zd9M=*7J9qmOlf<V=5apl48On;BzpW);VbBdq~w`E(u~sMwGg@g=ig2WjdmT1D7QHM
zqyUp(ZK@8a!to4cYPhe+JoUIMv*3C4ja`tk7%l%y&$(MMhb;N#TAnaN*OCINI>KGi
zxWT)KSo;d!oMn&ZFXN+<6>s|i&#M=gjn0)R@m((2>bAr{7%ug4wz*CeM5Vih?t0_*
zILal#f;x+wF6%Fml45OordVslFpTL_`HMO8jqE~*$>F^so)j$62T_Q8k93WE2E5;E
zl5b%B6nehr#?Z4Za5f)@Sw~CU?wWKToDw9rzDxA~s$@_9RkDAT?Eg#2c4&sv`XO$g
zi{M8|@~7)}vM{wZW%+sk>Gk)t6e5W@v0EvRi6tEKq+gxnX>sc8e^tP1m{VV<%9k|n
zP6VwHMB13w)@Pgtzj*@;Mt;nVhLArlquZCK1@xmhV>sGN9GE5wvh7!=&+nyPyKLUv
zyh!yP9<Fz~)E8-{9Dp^n9JbfZzb1JBjT_Ceb6MM+h0c7H8U;kfG^IPZL}t9{pF3=I
zLA33~r=5nrRJF-SC6!IIov@<tF{ENHL&-a`>vQ#^;{TS93wA<r$I_n5pPH+Nc{hHc
z9P2Z?J4T0C*4nJfmz~ZRCxQwSOG=;PibFI+h(wN?sZj6o#$q^#K;#vF_eJ)h5*1a`
z)}{09vGrWMl|>OoCOD#)ocl|f$VUtWb0YT_B=UXI9|qMcn^ktE0Q4H5&Y`mBHt|;+
z0N6*x9JO8JGqd{#XxgxofDJ+72KbbAv(65pD{c*&MazQHfT?s{Z%0@`!n5`;Tz!AA
zNB>I9kVLEH3Ma6qR^uq;YAAiC{D=@+C3;AG<V^i_Wvi|&Vj_FP<{KBCK_&AnMg0si
zqP{(46*(>XsSRzv19kx@A1Gxi>78Ejz&xPO%|4|JO|t7XRcKBUoUNfr({K<}IeWI*
zsaTsd&Fec!0zYCUOV8ueAUp-q*DR?5y!H3%>vzMn=p@PW_jFUHhzA)Q?67Ix7nd)W
zJXUWnzt3%=w>qr_gxv4<D0ts)Aai4!E18Z~mXh4wtwSDy*K5~7Xy4H!v9JVa5OEhd
zJ@yt%5R2vcx@(>&d@qs?Hx^?=#P+uf+Q|rKTCRr8WS(cPNpblA9Z=_^@zsS%2i;g8
z{uA5D1W&mSeE6tdcM4iv;a7Hk{?xp8ufYP`AZ|=v@Zf@E0nY3SKlA|=bKEVyj@e>5
zFb>#3_deCV#|)oO-6aU4zZ9NoS+1<$^Z>&i4>M1;+r)@knYv2yad3Z!DcPIZZ-ec&
z_VG$nh49}$OLPPZjT_$JtMo@`jOb>5$^nNzw&L|5?VUDVU-5&du>(?x@pi<zbz&f|
zMAr`)HcO0@LV4D8dI{l$M65>-=<;4*8q<K=%x>|i6UWS=yJ^lv+5EA^7g1^Sj-bsB
zG0spxLff+rOEl9+7c*iG$O&T{1u__CW<$i~O@4{Zq<BuDWo86qufj^PqEn?84=rA6
z4Zh+5*`+qCm^7nZkY;Z^O3LGA-3y&~eD*eDiLL6s)qKnO_2rFQeWsDY_Rgo0;icZ$
zwToCqcOV}2A+jeFo}y0&Cd$sF&_$3b-}|nkN}fHPx?oDCH4u#;4ZA?N5?tOzpdCM@
zQvTaF@obOuvPdRTnFMkm$<E2TPk`Ihj72`$Q(AOi6Ha~mxU~_s&rcQ(R8v$7^e=MX
z9k|BB0cSMWIuZuBjK&Pb%%34BeW#^7?HlR}{n!~ACUeWK+7EpH5ir)5--g)h@2ECx
z&v{};GD{-{%3qD;KJVWuTu!#mo_ZFOM4%WX8$khGDCH7YVjZ8S9-lWWD>lpCA;mq1
zK#6LMy-LA1xEpyA?p%vhV44c<0&}aHIWf0{Xfiy0)`iN!ndq0h2pYDxuUWQZ5Yie>
z6S+VWj6nfQ=EpE)V(NOqMsE_`IVVuBiJ(OVI|f;Q>75}Xf9x0;oxNGK5kDiOGDtpK
z(+!8wp<}I!XR%@X6wS{Lo<JdwC(3L(0@IT?>rva$GYy_4tK%tn25GJ!2h#49a_$UA
zFD&8EYF^ZhwkU+URm=576vTO%_hRZBO9dUOBOl$E@*RPsk{n@5N=kC<!z)Q*vW}-J
zEf#tkZNBf3_ck*zUQnnR+&fP^Z&YO%Cdk&BkPA~&op6fT{=o1pP)!Z9y11`ErxrDH
zwc#LomrN-|Z8f~``Y~)fYe~`oyS!GDOlN3in9^L8BR>XyszvFsjuvHds_Q}@IykRV
z9Vd9BUfCY{wkO~c9s0vO>^J;2y@O<#cT0<l{yI;1PB&`XsckJr_gjBk)b<v9$0-4c
zq{<=PDbzn~zoV0zjj7|$`kcDF{TM5L3*|8>#ZsjQ$958Zuh^7$5(iZ_YDm!so)XTU
zw>B=>WOnmB-ze)qivix9R9<kUF;#<HFbh1Y<x5R&shhVIL}?s2m3G0Zsz)$xlFStd
z!{Wl1?85e??63V8bJ$o|v687QM6r3LU$z9tEwX~^Da3RD?P`AN+EXe$N|&Lkn#3VV
z4z4OlT85}P^-iixh|IB<`9^OK8;tWhVzbZ;wKsx%R5kTWt@-fOA~^LFCC+lYMAYLH
zhU0amnheOQkD-!vBDmk*z0cr$PElaN9Pl_t07_9ZmU^()xa1wyGoB^NM|&qxO(URN
z<|7Vf*r~q0uB2TUf)t6<)1<Hq{->qsH2Eho#%Jvf?I?@_;4cYlp-$J0hcCVEzFXN`
zBFVzyY|l&hmOl$zB^NtId4ntU=&`8{t((cXFL^`;VUkp8d-u+i#s|WkwhRz2dC8Js
zQ~YClenI{lXli_>@X(C{0}*Y)S#(Wk6HBY;9g>JlATL^{^p?06KycWH#oeV3`AZaq
z@EWs@Kdan<cJDqk#Y+UOw*0;RYR()s${aXV>3D{d@l38KBGy~^9Lzv{q_>H5lJMYr
zS$wvHT$pVfIq2AO)b$K@(b1<*)|ad-bDpfDMc0O+e>?QMcC_(~imFIveP!wQTI1lG
z8E*p}Q_IH+nKaRzl@T`i20f9XYt#55yO{2TQR-5JpgS7nvH1ZJG#!dLJ4>0*2T`TQ
zq!=H}JbB9}VigpRR6WqmT6$_7^eP97Z7b{!(1X7N1bEcXLp(m2!%dbw4{ILeHgQ$l
zdTqKG*U8?a=67Ic@9lZbkKk6Gi}JNfwu~Th0nbN^<2n~4A5r~mX71H&xzHhY_9yGy
z(pM~4RWDm<VD&Vj{1$gnn=u;#q(;0v4Zltj5uttALWcE+Q?O>T^b<%Oe4BNt^>q%*
zg{#~j6LBAyJh;!wlQOuewSIN5o!5?YLW(E%nph;py<L^9F3^P3hUE@yFFRr|)@z>!
zFhQ@DyqosKasQYSp*xJ$?P{dZoi#EfGMpCaKckfp0KLERw3K7&xM@Fb(sf03ER?mc
zwt80G!Xkj8{hURZXHJIa`krvx{<jhR8u1zZIpmE91diB$0?xt^Y-*z71h%v@|B1Vb
z^3u<PN<djA`k{g0N;UTJr;5r_gR(;ky#unfYDlP{v1&zSAhYy<tn@(duxzzjp&XNX
zMeW)~1syZ95@2VLp+>C_NJm%pWs2p+kkp_&<77XJ)F5<U_6FVt&3iz-`1Vy7taw2P
zT^B(?0d@VeD+xF_v#a`$L^m0v-pd>}>KYj{8KfMy#DJWFA=Z`@c~EYOe8@uOP+%U>
z=JTb6Zyqj<5ndrF5du<A#O)40nIoU4_dj14xvw&x8bfRzj<;`%vR=5!1ofQ^#VNcR
z5Q%?X?lp6=V5_ic<H}q6NOURs-28(Enb?`Hp#dbjgXD1!)9d`?Ge8sM4K+kglz+(S
zM=kTudek4q&0kfipQX(=k?lwwtQcaD?hD4b-4}O^ce%~MBSl;A#oINgHPW9YMq9a;
z#f6VJ_Ry})@~lWss1C4a-19PGVG+RHE|aK)LwTK6$bMK2Xtak?oiX@H?)CX^ISl(G
z`DfcGRGwJlt03{^Ooww&%94II&AR|~$M*2#`+N<BE^t<|QN1w{y6wWY%_FbTLtH&Y
zd3Gr{chSsQb@7!eMplqQwWD8*AQ+UME!=kzxTM^7!<gTo{BmOl@3)($NEQfnhiu#i
zQeXH}Nt_IgAXb^>=i_HcZWApm+sTUEbLh83zJ4$(Ps~1vhKc02w|olyiBkvJQaO5{
zeh$VN1sjJyB-C$<|JjUqvKLX~fpNmeO1o*DZ^MVp7v6_Cn!HB{(>=O%;e@OoM#<Z%
z`fTDSQR^CwnM#Dos4}@I!i}J7%6zCDK^eeNl6E0+6+<COnbvg6%pC*t5R?-(H5Sh9
z=TsAMQ=BV~;WjG<jL$PSoSv7uea^wCtD#4JB%azQ;I&myxsQ~VuI?tWT4&aFX4Bp$
zOqM7nW>aa_Whif|9b|^dNmZ#!!3O^{->jR98{g7Z)ra0%(Xy=xDPcPD%ndoqj?c9b
zIY@G)40;nwPRNw(oENs0S@I&ya`_tz{^_v)Smg35qsKv>F9V`0KR&5`z(V}t#V&^f
zC&AdR3J*V`-Br6SAL;-t0V!XWFpEf4VqjO*ZKw@qleD$Xtdf?krmc?r1h_ux*eUb!
zMHSPjLg*{9`d#BQ*zv{8&pbe-v)0+KKRQ_dRMf~Uymej3Ss6pl3KLR#H?cQX1lv0}
zvKZTgO@DY%NOSn#iaSJf9?_#R5QPmqgk8#5Z;}79ji0eEWU7G%!w~91{%kH(UORfA
zA?SF>y3~WZy@%Ddb~Xc{zW4I}WJ55B>I6>>ZrH#^X&ZYqI2}-xZ;~-Z*U*o*f&x1U
zVsg{6lo~~2Oft`-4arZ;N10D3gj+)@^QE=y7fZ>EaOCWq4n+mpQ67%y>#9kBHcQPS
zteI246FSI!#%6HP1^0lEQFeWU&!y<#Oqw}O;iI5L5s|7Y6C|+jU5W8c?`^hX->Kl(
zX<R3sgL-V}+(8bl(?+aZ@>rZP%z?uS$DQA<YKS-)of;V)0cEodIsh(ly)6QZ0!uG%
zrH}Gw?aJ0CnQkjIU_XcHnc=YXr!&?d-Z8lwaSKJl5`32`CS6XSS70vv2HR&Ol1CmP
z`gqf%duSM+JaT_d^49iKOZqwD9d$QHHdVO!vy`#~c6MS+bf4mW&l{$S-}{(|3R{O<
zh)T*r0y~Vqs-&TV!@n8{QN=&6<QQ4IIaZ9o3s^9`?{z{2F^sP;8}OSDE}c=E%(;q{
z31)_rZ!*HG;b?h0Sg?OF_yg`1n~ZcY(?$8Vo!MRcaOBf$o~3ab%Tf4!o9^70SZa$n
zhAKVtJ%LsM0b^;hGFW_bHe(%>JzWw{4B11%(`+`X(T>1yHL*dzlXUuGa=A>KEM?x8
z&|TxD^$fBlM_&r^2$_zxl2XC*7_(4eYi8!3;d;bn@2$0YCXNGwJm$m<=)jT&V7)9k
z*d^Lk<1zdapVj>h+L9*ZkJ;;1StAGnxZ>IR8SdYbYEpW5a2R0WSXO;2V6YUAJcZ}U
zoH}*=&V@tY<1*2M1rV=fpKOLxr;!^3C6?nh!O3FQS`$SJaLJRgcsF@n-<{u_?1n8X
zky?53*b(<!i49!`;y>Yf1qUsOjfUtb57((z52N7yC^gdeb>JhHHZ8Sa4&sx2sn?e0
z_LgMCOND7F>(>!m>T^8~OX~-Z5tiV+G_i}2_;Ep!jRAW|t29HiABNU5p&Gkan>Q6Q
zUX!4AE=7%vN%JbKeU;>Fzi1V@gBa9*n%jwf=xGLsZlgioLgwfGVs4!so$PJ@Rqy{O
zHvo|RPF}WC=#OcXz2`HLCUe<Tbc1-o@UYg0hLx7kGYe&n1-QqpjpEkF%i@upeEcT^
zat&TMSuX3dC^BXMcm!8n_6byQn(wCVT2I^4nm9c^`rfAwt8m39b01EXibAaU9M+z_
z;UM7A<SQZL*lQEFhQgDLKa~laY*0ST*tzySmMPbAup}3@cr;^E{P^xP0y?c}V)PDY
zhVE6()5d*EaD&?wte{(SnP|LkZRmS7am+L6lvn|Yx}z9Ytt+5JFm|?0wEQhv)Aqca
z53SCMdaJj)!?c}QO+rxl9B6+;vXL+k&)E3|2DL!9Z=<0PTc`z6sUZ>z+I<xw3zy5r
zL60jot{PTcKRcR|7%tUEx{#P`L~f-B+}Im4=+ejmL5Q^e(6L8QOps9P_fwj`MEb|C
z-^^?(%Kn|f--pHi%Af&al>ah1_K@)5$jmR&eaOV<g8`a{#D5<H_(ci;s3ZL({$GXy
z9`bqE4F1I_0p))d@sHN<LoN?HWWTudLPDwEG?;((%l_}VFhBk+m!A!hhg=@kxPPrB
z1`=RH*7C68{gA=KLdh=%k%T`P{3@F~Bz>6j{UQaB{6YFK0er~eVKVfK0}#>-{<|c9
zn;Jc2_%Olv#gLlp4{<z9Hy(2Md)WJn9sn362LS#N1V1GIdx-K^auce*kpCI5Jf!}+
j6Zk8&5ba;6jsM3bD9XY@(DP#m4IQuy0bn-WkH7v8bRU2O

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'