From 9f179cfe597ce0c2a18304927ea98b0d16fffb6f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 12 May 2023 16:15:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=95=BF=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A4=9A=E9=80=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CommunityBuildingManagerDao.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml
index 1e826a9101..23b0f682e9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml
@@ -33,6 +33,7 @@
             (
                 case when m.type='0' then '楼长'
                 when m.type='1' then '单元长'
+                when m.type='0,1' or m.type='1,0' then '楼长,单元长'
                 else '-'
                 end
             )as typeName,

From c2205665d5eb1801f8ecc6ab5eff2384f62f2095 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Mon, 15 May 2023 13:29:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/model/BuildingInfoModel.java    |   3 ---
 .../service/impl/BuildingServiceImpl.java     |   2 ++
 .../impl/IcNeighborHoodServiceImpl.java       |   5 +++--
 .../resources/excel/building_template.xlsx    | Bin 11754 -> 11727 bytes
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java
index 38df15fe5d..3a72a3f253 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java
@@ -47,9 +47,6 @@ public class BuildingInfoModel {
     @ExcelProperty(value = "楼长身份证号")
     private String buildingLeaderIdCard;
 
-    @ExcelProperty(value = "楼长类型")
-    private String buildingLeaderType;
-
     @ExcelProperty(value = "排序")
     private BigDecimal sort;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index 8eb14781f5..c8a7d1fd13 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -121,6 +121,7 @@ public class BuildingServiceImpl implements BuildingService {
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setCustomerId(customerId);
         IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
+        entity.setBuildingLeaderType("0");
         icBuildingDao.insert(entity);
 
 
@@ -735,6 +736,7 @@ public class BuildingServiceImpl implements BuildingService {
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setId(formDTO.getBuildingId());
         icBuildingDTO.setCustomerId(customerId);
+        icBuildingDTO.setBuildingLeaderType("0");
         icBuildingService.update(icBuildingDTO);
 
 
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 f9c10cf973..bc6175f78a 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
@@ -629,14 +629,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     private String getBuildingId(String customerId, ImportGeneralDTO info) {
         //根据小区ID和楼栋名获取楼栋信息
         IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
-        if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
+/*        if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
             if (info.getBuildingLeaderType().equals("楼长")){
                 info.setBuildingLeaderTypeNum("0");
             }
             if (info.getBuildingLeaderType().equals("单元长")){
                 info.setBuildingLeaderTypeNum("1");
             }
-        }
+        }*/
+        info.setBuildingLeaderTypeNum("0");
         if (null != building) {
             info.setBuildingExistStatus(true);
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx
index 0f597ecdff17753b7baa9d91b74e9c699c94cc4b..3fdf17e19afcb06841865b6590d0452f3b447744 100644
GIT binary patch
delta 5499
zcmZ8l1yt0}+NMiDTIrGnmXs0!>F!vNMtY@`1q7*|gmf({;F61=(%~X4A%diIBeg6k
z-TnFh?icsmIcMg~nVEOy%scPQJkPUfHE30pi%XE6yL}Jw0T)cXn_4@YGUSIC#pMRP
zN}1zQbPhsp*%wZE?SryGzj*jqUBA3-W>TWm%#Agtv|O*B^!86Fpg@H4AR`$v->7dx
zg9KI{W0B!1X;_pl`AqeLV*WuZC{$Pf;Y2VA|ET0virF7muydE~IL=x^9vb&qUJ6LR
zU9_FNgK%g-fXkALurlTRt+w`?#rpt_rV>-)x6EjunFvyH%fgo?>B^L)<s~bGsX!Cj
z#iRw5VS1&R65R?=3HFCUXEi}DA!dG#7JuUK<CNR^pSJ0K`f%QN{pY+Zm#Xp`1GDaX
zDVwH0q2vz!G$GBlAy1lt`Idp)inY<7=SRXnT5T9?q%8K7q@|c`BrN!O+vlZ1D<in_
z0`w*iZH#xRm6`ptyDg|499y~@12i*?Zg?)jbeI@s4l`@m3>WOUD{zdEL5G0q0ve28
zflK<(NN2YJ7YD}(u|&WEr1t4EKctH~)eIr-yA(qV!Aw9ToN6VJ=5zr#k1#24xfAFg
zMYKQ$8C3=yG+nJqk)vAkiy|CGEfV26Qn#)JVx;l=f=+Jr`2_^u^!NH_<lAiOXuQ1h
z*+nmbZ}86Sk}Sjgd~b;L4^8lQ&+i1E8H7z@pMGI?5sM3Uq*IatG8lxxSRv-9{(Hqb
zD`k6p(HY@;HXjx@ckhoJ@>e^<jj>|fo|%VHIxI<WM-{6CY47~N-5b(hwcJnCdzl?M
z^B4r1Gc9fNIy6bu-d}-Fq~aa!s%A-Naq{rMC{4yR9E;$IP8FnPum;uFM$2R~A2}US
z3W4v(sIqT{5@)M`5W3preW$m$@7ZEm!+)19Rv-w%$Dm-F%Jswa8$W9K2}GL#w`jmR
zfxqi$`yk@k6m)AAT^M)BZD<EM9_&D6PWf|wVj?!7nhKRrc{!3DF4)<vvi9QGRAIgi
zN9%*}V!3@aF5^w;#`w*H)cwi!WW@p7t@HBV+v6vGACcXUe-e=iSNfHXxF%E+_ANC&
zGDQxHG;^d7Y^|`^m2~5V&{8;Tt+X00Kzse=$mFBtulxD<lQMU&zaRht7Q`eG2dQ~8
zOm_qy2gfCqm>u|Nrk6acdcTExpIzN&QS}<`gwTsI`Fc6*m8C6ETeBAXL`z-vq+Yyo
zvWX=H%m-OEEHpNKsrr&%8Qb=jYjH4T`^0W9DJKAPYzE<qcDnk7am_vLNEUAnWYK~B
z_(}~XE!quuxAy=7*L1<XUfJ16)6*uedf;HpBZuOh8v;rTP8XP0wb?TtuPLT*KE%zz
zFT|geT+060FAc_$?&zi^F)n`0Z2*mDt99yC`&#8r`Z<DVEXBx=nqC%dKq7;!-dgn2
z@@YwAkQ=rl<HyRTk_!Bn<0bkYPNwBb#?E5(JJ<Y~E*z-coX6<04LiN~%aP6t+mi<g
z9Yn)Coj@E?zJEkOGur`1%So6`w^2dhExp!rIM-u>iR>}%v<$n-?XwpUM=g62B_u_u
z5ubdOWm3m0g<2U%<PjZZD%`)M!w@d#E;d+L(LO`q3%@3j`)-s^0FhZWnOZg`@+HQ9
z1p;Za&d8opVWvCcWdBeL5_td6Ir3y*T2=Bc0c<cxFTeGRK%QrH?+Zfoxa6IYkwQGX
z@g%Fbp0D-mMrY>M&#{kel;q9M^@Lq~6sw<nb{`~3Q&qkKRaas3wfd9x>t^RY3a;v?
znWW*;mn3)NWrPico$?TzTCRyylec=%Lt!=g=~<%0C`&9s^rRV|^U3f5ap)Z##+h|V
zfVr!z`U+R_{u8FxDyQ8Cg4B~)B&|tPZd{grKVH!eS8#i@imb1XQ8(%RP-pcnh+Utc
zev}ns%UV6D>M=oGml+ev>fIE(CqhS`7azZIv1aO5?Oa+c6m;L7clROx-lPmIscHJN
z4iDxnD*}Dv?DCjsE|*lA8oU8T`_H^AFyPlP8}c2vRoDV%PT6UV4bsYNXZ0e_N{e_d
zT3_&WWJ}2l-=A=5Ddce5-&MpeSN?qUIJt5Nv#qaq&%ic2<YsN!&fs2h=mE>%Wmz)&
z=Y`v~)5-<8+wJ31yKMPOzx_TR-EYB=pPpjs$xygAanARxMU%<Sgt8vj)bm#~rNA+G
zhDk`P^czEZiEU&Zof;YbE%)`u^&E!j=ar>bi%Ops3p&vv_YBx`<!>%K(3Q4=Hv!I1
z<9{lMga$x%p2DtmR&0loKczbG?ub62o$`pSh}l^?lHwcwh@W<E{k_^9Ub3O2cr1%u
zEQ{6BV`g*1)~1UiJ|vhh<3+yb)S(5Xv=hG;V^V+E8C}-g&+}nCyM)d$LJ3nQ3EF4h
zD&?Sci$CBr=#`c?=f+=--5iub4HV0>9YlMen&6&OWRzQYNSPBoPawyKH=EyzYWCdl
z?<||$QmNnKp{edzkO6zdcOkxHI5@xbad0SbaBu=VM0|W-dpP?D2Y7mnTmMd;HKzwO
zmVqkc_KrB@kEFw;9VcyG@pLoGA#EWV8dNVrT0EU4s4B;esKz+oiim-p)GxovGS>O2
z%4-z9U`%<s=V{*ak$&1+ytUA?i}@9q{i13NQZ8ZpEco_U1F&{s>$=soKV-TyqqKfz
z`}u>{1UPQ{_^JiN>I+_I^7N_^(7tbBy8sIr+=1x-se(CPZrRO}70^z$_(5mkc!JGU
zCXW+76l{&VP07|oo7HcyPqPJ!??vR(w?BVrNRf;;yBQq=T{rt`S#H5<ne=pe{y<&D
z=l)ymLH5^1pMei(9kTP)a(Qcr0NK*S@g=I46-$AgsjILl{cSX_`cq+Uaj@ka184u%
zpmeh&+Y+Kt3~@A)vkOTV;k;OQ>bmkKZn}(G%V)v3y?B8ZucSATIX-Rp3x5Q%@HyA5
zv7uu%&9McKi*;Kz>+Dq&*UNi}Wh3ieFDQaVNWXkieg_PvZI|!y_S*CjUOksqo)`kH
zVGiwDgKtP|wpcBdNX)tG#{GQDwPRe(i_Tsx9OLsyPwhf<N1LZ-%E!gLyZr45Oems~
z)`*djYB)iPJPf-+XpVyHkgC-4DDi~e64x(UJoA=b<9upNevTA3y5flLgjFF?q0^V0
zQ=)K-Qb0mG#)8><$6j=mR(w@C`*C=oho&{X%*<lftI(t$hWGld9-h6el02Zy;z-o-
zi0f^PmDh|lHKmC{ytWr5FD=yzBmABqyjW<F;@lluo<?RxQ#YP0(MRxoJsr^dR3y<j
z(B&4E>SDv@Sd0$vbw{qFnVv0oJ&0WG^0t{6odC9qeuoLnT4|WkO^3ODk5x{7k;kHR
zxTutz2q{XvOrHy(GUqLcayOL<AM($UA6Z8A-PIbpRi|`oa?kSX5VcHHZ^~!NtYFg2
z2nj@Ej<+3|FZMvsTco+afSavD@mH9SYlp`YYAriHVMW+KNmpOH!(WtHgbKi0)6Xy<
ze&ALV6UG5Nw3e{KS*@M%sGE(led;~4BGTHh3SG^qDf50b;8ph?uaif!nvkp3RD216
zE{B-aHMqVyje`?Xdtim*PiV@s^*%T-X`PhwTsBk(3mr6Uns}5L-ugJcu0Hu$Os3Yu
zSM*}Js@BWy-s~eoy9E!F!LQc?%Z+u8bb!R%OK+ixN{MK)aFI#A^3MM7i-#4j`D(d_
zp)mS$Ni0SSr0afqjk+tKPG(bP<SzR0!DMZnbr4m1;lr1dl*6~(3d$y$3UODQEJv(c
zZKs0wC`%uzU9lT|H>NEE`+<i!ZRxrGK7B?jqidU{zO>kuBik~3Gy9ElluH?Q1PF?K
z*yoAM>}(rzetJFJ;vTUU125}u^MPE&P+mo3pUl9bUM(<EAX&)BD)feiAE>?9_?kXH
zlv&@`ZzV+vNF6!=q$#NRnc*Q~3LKrVhX&OIY=;DWied(E$;fyQT{c43ukeCy7jBJ|
zVf7>jdMVK0{Fj+-BPTSRyBo?4Xn0#NV;cq@>lt^YkMz$ryi;}9FwQKijl=52Ju`DR
z3>ThMs}F%Q`L4f#7r8d=2uU~v18q^<zu!3c%PlgT*&E<na;pcC3~|c&eT;Tm=j5HW
zO5b7$P??QTbCHe7X0uG$X)k77B=eEebiKoB)o&J28?{zyuA#Bh<FC;Hgvg5S+me(K
zwlqc%kE~p|lqtbBa@vyr*hc!hqP$Ne->J&pDcbg%(l*lPd2CQJ^f=8#D{a&mzYb&>
z-g{@+#ynWE?ezz`Y(YaeS5FQ)xw=<8e$5my???mUs6NMyAwcgC4>a_;OIFIv0hlJi
zM;$sJz6kH(Z>jTR+EyX;K#KdDX_`(J7*EpU&xL{XL|L$Lt_E&<kln9mr6>z)5qo6(
zC@crVN!;F86PJ<CZ_=<_lqS_?y+zU_)o>PWr!#6<1f2wXzBGz9`(?dkO?oMyUGiW=
z@YTl@nU^6-&7JCe3tsoek>+X;pqJ58B0BbKWR6UBddle?IV5@)2%sW6W@2fOFCV%I
zonB#)utq`PD3wESaa{Zss%ZIFBgh(B#_yW>GR=zb5sy!4(m|BG)^e9;aW59hb<jhZ
zButIxdzIT`ng#oun8<@KP(<sP#vEB_p7!WFPqC$CgJ@qvTGp{Obsfxv%lxa53IF0;
zuc=u8dx8l~jolbPOftA~;EAeFwVYwgjrV)b?(7{(m+7e35w3Y}R?+(~L8nl6sT0x6
z8Z_Qz40&5f;TIctqpD(G0s$p_Iv)JHMYh=c19c9taZQ13iAVvBkDf9kpdM6Edw#`1
z>8_Jdu2q!A3t5{`dfUfrWzQbVmlwU+b-4Lqv9B3EuUZEzcb@i%-1;1FkoOR{>$CMp
z*C(j>X>Cj`EZTd`M$~VFb*d=6NPGpxxDI|Yn8$d`vp*JY-cXez&k}PX&HVa;kGc1(
zPvp~Wy~6qR#@PlY-atO{W>cI{#%5XCFvoGEEvV9^0s7n;6-*=CtrZIvElpqN8V(;W
zSXo)`5hw@t&8Xb2jyenWBhcntC3B>Na$RuEvC$(UZ`BuL1rMw@1M)mvwixdnRi$E-
zZK?CdZx#%?216P8)UK_R!%oY8#iiB9ld2v|aaLj;ak^~SUGI0EWwgG(x{fdhZMxHP
zHTMOkgXo2+?8xqQlPBr0wuYx6DeAMnP}_gju>k@5iXWn5qyy+pXl@}siZbIW1hzJ0
za}X)=mVj8neIXCI6sY)<+r!espSoX2o=o|2al!*QjBHd{{}`u=*4LjNW(?+vA-VoM
zn@Ue91O?H^QHM6t;bYKix@9qP=5$R7<}RZ1cnE1mGaMcd(5+m~+~o^FMiEb*2P*?J
z7BxVUf`aR5d{H<nz8H1heAd;5$JL%chWM119q56o@wKZ^k_wgBf3_1%MRI|Jf)L3D
zBJ$@Esr5<(lx6R_SLDu*mXEG`zVR9!@v>hhlF~gKP1$@;hLau~z^k@wcHsU1?e#Gb
z&C;&tpsZ@Emdlg53_g#TNq*nO^{Nn8O9(jBm9iDmcj_?Fjvef}yZiU&rE**CjAs9_
zykFZGX{djC?mBu{Da@AFda?Iy17Ne33w(G!!05=qrJY&$!z4lZ2X$GHwy&NfvXdm7
zi_VQdYh$!E0k~|5fnSif6ryy6Vm)HQ;b9q-eduF5fbhLoU*`dVxK=E-c%9&NA@FIk
z^I$CH3mjr*wt%9bf@CxbOXBI?6-By^rpUl3MWGXe6jdWM1KeqS^fm9>;o5ib2egT3
zkJ@qz!p8Mt2TeSkg;lJ!rKK9*QKSuUd>G`=^V$lZr&niFDv@Y1PIINFufa|${?Z9n
z90{!0R9X8z`u#)*rMGG{G^4@L4A6(yNucN1-VE0fPjn}Gp+#iVR?cM4DDK8kf7@bR
zt6;Zh$kB#fNd<C8zXL9%17#y8p^L3zWZC-I&q1<6j{bvVQZrw3PNHn<n3>fbUHuF4
z{rzA0>lJ(&Z`@VxLa_%ng_dplD4a<728OX;L_pERA{S>7VWa3ZU}vBRVA{Xif{WP7
zzvE9hW?phtzGC_Ldk)ocb(5m!OG^(`Nhbx>x@*8t2cLlMFFGZ`iPm3M#0iz~W&f);
zVE*QRTK~bUP<xoOlZh|vxtHsIL)Q@afOdx>)z97VU8)nWM<*OyJtrJz1Q$3uXsIx#
zM=p;(JW?<!mIOkv(2b8ri}?deWLj||7|_0uwMg9aJ?Ykk{ww0Hb(Yr^uQc&?MBT!V
z(<vpCoBCnUL4u$rS@$eO44%oIrUV*V7FtRfs9)!zHPkH~Mmwc^W<_;Sp(odG)z1q-
zhA;$}7m2Ma?GO`K&4E+{ggv${h>ogM!X}(K>A`grKuwAaG3WFRZucUk7y;Nz-$_gm
z9WT}-hEgQDS_S5o^Y3H*cwOPmdf01JcK>F@{k6`b+dKh;F6HI%<Hs>r>}zTfp?5tN
z_(BzHdcN5}*Dma!@L&sfQxw~~R_Asx@~7nJnA-|6YQi{>A+y8g%yeyBlpEQC^Dmc@
z|F2J>4chJqBThCzzeAL&nS1~4#QgJ-!nekf#ecbIc*+}?)XAsn%_;bH%E74z4cu(=
z?P!a70dlxvB3c{$!q?UU(e6uwufkmhami@^c{w_c_x|pjW<_~BdFW7wOl!0G*NN@c
zvftudqVf@9k%5eAw(rcn6{;nf8tEoX<%ZT@!7Eu|8#+G#!wtSz%vRBIZ(CcH@9k2R
zT0Vii`7i|fU2)m)Q1Kw7*zN9li6K*61b5fg#oMQam#DDkI~@fOTxTNw#M(}b17*MD
zu}y)5&5Kd#Fg|v@78xd)I;*$k3Oh~kuf3YHp<u>d^3*JeeDdhu;w3hWd=uvm)c(Q4
zq#Eo5-p6U$NL#Gcy<hKWb~mFU4R_PynCjr8NlWB8*{EXn;cqwM64PuAe{0VxD-_@l
z+P?<)l?i-{nfAyvl>g2&EUnSLFv=6rKC-~Q(uxQpU_uXbB@*Jffe`s1dW0Vz7&jY%
z;uFVhLyYku{v|}Z^Z&$K=SE0?C2{W}+`vN2{~6tX0~`kzhvRQKiueNN<^4~__W%77
z^#8`+5Z-(o2o3?ke^cj71x#>p5yb*hxO|930TA;)XRh=24(a0I;N1OZn!o8^D?LDP
z3d-SrMc4|;;wmFD1(k4p5p#l4%>Snhk>KFm|Cho4SS%rggw*gh$Pj{em=H-qV7y~;
OM57Rxh>`D~VgCg@dt|c!

delta 5510
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