From f0940203c90801091c2664ade739c667e2f327f6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 18:27:35 +0800 Subject: [PATCH] daoru --- .../epmet/excel/EnterpriseImportExcelDTO.java | 19 ++++++++++++++++++ .../IcEnterpriseExcelImportListener.java | 3 ++- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9284 -> 9302 bytes 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java index 8507192422..64c847d684 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseImportExcelDTO.java @@ -21,6 +21,16 @@ public class EnterpriseImportExcelDTO { private String placeTypeName; + /** + * 10.26需求: + * 场所类别:0九小场所、1企事业单位 + * 默认0 + */ + @NotBlank(message = "场所类别不能为空") + @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + private String placeCategoryName; + + @NotBlank(message = "场所区域不能为空") @ExcelProperty(value = "场所区域") private String gridName; @@ -72,6 +82,15 @@ public class EnterpriseImportExcelDTO { @ExcelProperty(value = "场所类型") private String placeTypeName; + /** + * 10.26需求: + * 场所类别:0九小场所、1企事业单位 + * 默认0 + */ + @ColumnWidth(20) + @ExcelProperty(value = "场所类别(九小场所/企事业单位)") + private String placeCategoryName; + @ColumnWidth(20) @ExcelProperty(value = "场所区域") private String gridName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java index ac55be4e46..7ace7c5c5f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcEnterpriseExcelImportListener.java @@ -86,7 +86,7 @@ public class IcEnterpriseExcelImportListener implements ReadListener originList=icEnterpriseServiceImpl.selectForUniqueName(enterpriseEntity.getGridId(),enterpriseEntity.getPlaceOrgName(),null); @@ -117,6 +117,7 @@ public class IcEnterpriseExcelImportListener implements ReadListenergf>68vZKpH`MXc#(F28KbpyE~*ox};mW8$?h-c>dnK z>#ld-S?k;DtZ$ut{`lgLz5A5sm1~dy9IK3VxDfya#R8cDpoT>x$g1`7kq@4SuIKKo zv5pVW<(|seuwjK#^qVNJHCd)7F)yF)QC%ENrSE4xsOB;BHmn{+hQ_O{J!P-ocPZr! zmko6&O|o+8fBG8CNR-HKQ$+cqRkQe!+IPU6#n+4@dWsf5jd@TBQIf(AF+Hk7eJ{Y5 z1%BQuPmy2PNCE3zjAkMKj{Yq-LxdOFQ`vTeQT64^K3;cXJPA*?`!M$)!DO``Xc<&^ zfS3#WW)e(J?anS^9M;R&CvAq;$_JCO|14>TSc2}_E)T5QsZGUn_}kR287)Ayh?c2& zV9_piREDP|K}BhAaAZ`NG014Ya6^AwKi<^(LfO9h&%tcNM1{Tfk|ZZ&vZ|01<1>R- zYT+8u5n+`nBSlEN+SZ$wA9eh$x%>Huu-Bkw`7di-4xmWR-F(P1%>Qy*4o8N z%iYBl$%#e?d-G2RBF{0Ndzm*Fg{GVNNfXPpg)2KEWl1v5;K-U55%yzNt? zy}rIaYaVsG(KeH*#1`JkCJZT)X?+s|OBO{edS)BJRF#N}UP<@?orV;2e7 z?2c#_Y3%|5b+b=Toc(Froe_awU&)r6F6?YnTIX@m*v41s0&rOAinM9vGAz_ZDbhU~ zgRpvB33Z7NRBw;GE%%L;nh&C=jt5>wi<%Fb%72QXVbkWfYiB;>SSzSc7*vVutfy%e zdzfKkZC(B@E%`fPTu)pI8d#6qCKCNX6A>Q%n9r2U^=A$<^A*(B`VtUNi}Xg9#bJI| zpHqv5f}(`%L1%;+XvD3^Q+I+d87f3wRUaCcn1Km;E31(P?+VKz+_M_lVj8XD#0B8q zF0S?%g)dD?=ROe0$~uh}axzia>uxOcJ-?-De+IJ?I5!_lsXn}14)N#l89FGmQyE zI?zsIQW_mLIv600o6abLzJDWeG%UC4{FWF28;#jEij&I~mvvTPkuex#bY~+?xNS4C z6g(-%H{BnoIrk&(7rdrr+XgH*`6Y9s@8i0Sf@@1EATht3Nmc1oOxY<43R!9f7lUxy zQI%{tOaMADi-@&PC&a2)2cVq(_l0OlIo<3Ky#-iA6M`e{*wkZ~T1oGW?=E+LpoQsdNOJvIx8kk(SBStL|lI4>2GAHSMRA7DvQy$B)re z*j$F@0LOh(Wlm#0eVWk;s2w^i>eQyUo9wLwM;r6dOd|*7NjMfxQ+;fY81|sC+q`+6KEM zae8`OY^wtw0MP?2L($uZXID7#bV2wqY>Ugty69Ho1(Os%zG4k+4NIvF=(H()pM) z*Pz}w!iv%EP3XOLLG;=bTeK}w__i+$HOCtNR`{CG6F2L6$O&v*@}qT-Ie>oF9oO6* zm3M3wAYrRc3AE2zT2-bml5Bs#<9oo1e^y_M4aUT9$ctm}KrRsiVR0))6p!#eSdC5( zR-d}%ps$-Ze<6}ajg#BHkP-(+YgZ+MMhz}0qM5oxp_6NZNlAeN&8>MIV`Eqtkb}mB zU1qcLM?gdDDyFNuh4-dIxCOrIa3VrqT1%hp|IPQC$AsjsJ28_5cvO}93ZWwW9LjNI zTbZ|LHgPV#CR_Xiwwk`D*p~O{<>;|V)%jB9NQ`8e>B{4gVUyx!jN`gU!>LvXYrA%_ zJ9VUzVfmc)`Q)?L`5I3{Hyi084EUAAnqgr_2kbSKkJvZ_t7Qh|kaD@vOO6$jH6MGz zUc~g(pxI*S!6i#Xz?CfnPZ>o-!~FHV#R&H(FXk{Cn=WQRXsKV!~-6l{MLzDwx<@BCyPAxJ@$={G8-QiGhh-s7OU1(CX6sT-xqB{K zbyXvxh`9~VKVJ?XAVR5w+!tReg;q|Rau?>>uLo~)S0K1Aldl>9owV0YQ?uQ>w5*zN zBLQ=h)eg&)zT4MaNGo%V`W5bh1i|t|+@oI=`3KW`k!wfQcRqJ^f{^rVFHSAx-# z>cf8BUl=@=6{RF1-!ph2nhYE@Al1-(Qq7A=HvAFCnhZ4DvHk8~sKZa8cj-aVrwX&! z``N`h=JOhl>@ZOJp!bR|Lh6H#BVP>5LQ}J;Kk-*Vh$|uCl-&VCu1YyWL%9j;2$gT2j$1gN|s3Q%Jn7GX&>tQ;SIDt&7 zcAGZ}wv)MNig{V5t-_P>mmRVabcdMezkRyjn+MYa52l2cnL-HPzDRzSkQj=vm5&?7`2;?VD#A%R4l;mlj3F^yeRx9Sv*Y@b6?~Kdnx8@YOBs#C=3;_7}k7 zi-pZ-(hdGhYayYED~6EIawxFVyd3QA3WQRy(Ou@H>pG!&J6i;eRz<8m8)hSkt-+Wg z3f(qa^9!u+p4KWHP*oDkx?gs&OW5W8T+=d(7zm!ESec&aSUv$RM6B2vNux7Ul!%h+ zSNsNfS9cZCExILa!}?`=%FOw<@0wYcVtOe6)@A}NQ9!2$rV3y=IJvnT0EjM zdYpkJyh8O|>%_{x9O=R$7T;s0A3Z5&#rLN+|c0q_@ z+|Z6-5q&WuC4*o)=s`+|f4P(DY>&KXG%d%%mTqn6|8+Y3ZTPm6TfKK=wpo;!M0Qj~ zb!}+c0KXmab<%X+HLPbBUwFZ-0ZQHSmMBmKu_J1{%oHVD*8qkQP7F`OMI;gm>D@$_ zkN=_%c;RhdX|h+}Cc^YKT6Z_Q3t4>m5cXS5GRhE+l^n=O^fQj*b=3*wOPq!Ln_>CL zis@b(iApAqiUX%8o;aob@0Q^l65-N6(e~*}3R~#WuKckR8L;N3H14Ty0P&fW9zfik z8$4|@s(ZjsdziZc<^5D77rH1b_hjOVBHOy|kC9PkHbp zd0Hlg$kW31@Jx14*G;c7X5PT?#+%uC{@16DBa!^KTUS?I>zR*do^!bgO`N?7 zy1e>GB)wrO4*??k?x*ZnuJx#xTHIo1FELk_3|OB;KUOHr5zLgTxb2R|?r8P&>Q+Gb}ddPU+H4}k6F3WhxzPg}~=l@u` zT}q}Rnt+)F{a(AxFhGdu7!^M~jP@Vi*Qz4KESkc_VyHvJUK+P+4RKYgIlTDu`{x#N zol{1VgIOo0{YLEg{1z$wD(FheGx1Of7K@>9H)*b#io-QU`7xS2RR3K}_I{i+hJBIu zvxyQihuQca(PC7^?;C0crZ6e1m~l(B@WEy(7JRU;VhQr>FKBC>8z}n^BWabU@#n_t z;6wCAZHd?{NAR$+nDEd*{RCUB8?iqU9|*F_`Kx>UQiqnZ&9WpvDaapnPwXqp7iF)d zK3-1kJi4&`I@6SX1SL@{p<$|7lhq4i&v0?`moc4+CJ0W1a!;4>G=^D!_GOUw0)&z> z6g|O2GS_Zhta-BpT-nw9yLYDQe+MDt(-OO>yn}AG4v|Lk1@WwfTA(^&olq{uo*BdB zcS(%ED+aUMec)t)FW(g5{3m686fIQuEu+CSl3Ro1Y4NGF6dowTWvAK7w%#TWQjtnC zKkQJGBNoz=hD9}&kOPX*%wV!W-vtJreu5=nl3rSjM?Zv1wkFvA?=>SL(<{N2`K-@L z!T;)ub-5Zqqah3eb~i}=nwAn|EC8~DI#4BkAuEO)ybl$h?nE9CIx1Q_%F*t~dm9OW zOn@RoPW-rqf%ZL$uyz57s?!kjK!1za)eGAPo8qtVu2}P(;4d?6YhKRxOwO=8-M51- zxm4*xH3YgX&59R7qyZe;-G_Q>t1AvPZT>|~Q&p!8!arMA7x`$#+kgZeZS`%Aw2;dA zKR7!AKOKV&WJa3Fy<981P zUX{9=n$fq>WBPpQ4{@0#@GUxX&hL-X|E<~OT_?E-|7!Nn$W$62tiHB-Xk43Jjho}! z*hIZP|Ez$Pj`FzLw^zesYR&q%1a32pS~~1JDr0IYW5W|_jrwKk+y-^c+q-qod3dx@ zj>b8g^hemAKd+fy;MM%5Jg&htKgz2-jy6)TOSQ|IgwmpLc-N1iP#W{RpQf~wrA72k z5fjt)t|cbbR~2{o7FOuX(xfV*rh3JXr>2|vHb6XmOI)2HFA0k*c*?30x12Ja(eM@QNsRO)o;+Ve4h&YjFJ zn|D1}&iPwpu?KK+*Nn@>x5<(z@*wG!w}~sL&XFooemikL9po*YU3cAo*Mcn?Xi>8a zK>6=l>E3eXB1>uMV2EMOUOwW;bLIB1U2*6%i_BaBY5D<%KI+KQB66Tic!}`2%LKFb zb0y7sU#UM={*6+!8l8;tyG|-sDvCHpn+0|E37uV%Z&tNP$(j=!?Q#p&i4R*_+l`<+ zbW)k(#ORAg)2u9A)?6Pj@#Dz$d$tO^dM?6k7V8htTxo#8Fl)hdTjL&l!z6gP&2OUK zxkl294SC1zA`()WtMDII`2huUWd^if+X~_SPhSa+q~56t#vN*xq1P1%aJ|9W9|%pD zylXRX$XNSU_uOXg9I+Ct06W!`rJDHD$(&g?4P{U*!fY`%%dxRKrb!C~_Yp21r4Iz(Rm7q%oKk_)m)k{*o{L2GPIx|Nfv9nFf{sL?9Qy bOu+xxGuS97)c^IW7D>j;i7CqXPx5~NM{eDn delta 5283 zcmZ9QXEYq%*2YKg#2`isqn9AM=q;m0L}#K!@7)Mt5TYB5UPcchQKR>e=p=e?A<5{y zGuM6ZyY71b?^)}dv)0-BeAxThU!LEzTCZ9)5{oEJGyhH(3ji=f=3s%~@yYGlJx{13 zVC>7_Bb1~kyzG-`D!{i82vlSdAL?*r1NPODIa-7!<;G`58!2sBud=(U;o&6Hu6W-p zc~>!xi9g$ueJ5_hQ_4-Ov=O>d(!b#p<2KPOuZXJAB2G&OesCbcA4#4-X7CMalFhW} z=ey#6_hxtGHq!gjVE7UqM`oeit+mQH9zCQ>JKR!XZuRYg4T{BSCHWoCm@~t+3IFON zTcND(0eLyfXBmLom#B<2PS1!(d3R{~BjWN{vFIe{nO)=H$QQ(dJ;`!RZlHDTsIh^8 z4p|mR03N^jtLwtKMd9J$7i+T!P9Ct2KcwfNU@zdLgM8*;Owd03 z!2k;fB@@I)bc>QAqA43jCZp{+##yCdCE-sP12F+^u!I z+&#Pnt$n?H;O?#h{;n=1Nn@J#D)jA#VU!2jHM7KTh2|4DmK0>TB?ARrTWGS1+0i~x zm{vOP7y`jTY1!p;ioA34jsTh>*v34m#zPikmQ~NWk8X+A*fRSK!NfAw40B>d$!!2G zx2}(E?E}p9SxpT%5-4Rgy^weH6F{YjM@NCw%q7>Q zuB=d9AggEJg}jO!^M$BN{QL!l+kl%Je{N(=Me`jvlCnGai$dk=u%eY$tCu?I5^2nd z^vGabMWU4_FSzS)?t6*s$7O*VKoJWn)WNFj^2Wzqdh5`((Fpb_KM5#ry)Isf%-B4# zcfO`CHwwD79wY-V^osn6DAXaBF0&G+ zNA0^z9l2A{B%aT0$O6gU17Dv#Z$h}RJEkN$+h}ngNUL3wf$+Ev#Maf!Y;AfkbP&kJ z(CrM=pXr^J75x<{;jpB{$L3cvEvY_gFD6pCHCtS#oq{RNt+!tVxT;5bs>A5*+V5Vx zw>)RuUrr{sUR#0-na%J_VbP2hD7#4cgGgH3D-&fgucUIEq`38QSKik77@7mjZp|Kh zHjd2ohNu#z>eN>#IuBS2R1g_)fBOiN{4BNjMWLV(tI}`P&o41#$#cdHYTcyS4fK3N zwf2e4Pn>d3>NSk&B~CNeOYJRWX(q-grseo&ix}#nBt&Oy|)i|KjwzpVJ8G!(K%NJ^)zq63*^; zj$X{$-MwvGn)W+<+v+-1rAjTm1am`VyoDY9I$S?_d~GL%InlPg+v&E*dz*cGa=f#7 z=(T;yY+(cMd%+i51s{2YvPJCKP9O)j<>kjl%}4X{hT(6_yB-BgWXp~0$&Ut0=iUax z&ekh5&UOZF4$o6}x+}h=%j^HG`_I4iS*G!9#uSQkg}oshytsF&!)7(uOE`zvpzBUIQPu;ru3X zSZt}h)>6Wmm;m3H616ce;CkcFimqOXNd{bsSYA^(kw2c{g75?EFOxzq{Bk@#F7Eqq|gN$h<>SW2jfoUf4=0` z9|B&grNNu7Kd7aMZS?J-_j!J0&-(1{OJ}wBK8N5~s(?kZF*OrbjmqKTagH}CaIaZ# z^7~ZJnnJVf8@2^sQx4yDUERl}+h;EJRR-{@H8StdCc2Q|KC~}>rFFfA>U5cp@A1OQ zJm^vtXZxzd_L5k1EzYzgXhptBR{+s+JzXtg3Zr;T(1C7UuKv}d>Ru%yb?`~sT_ybe zyIRBY$)TQv-4t<&oWmcCS8OHQ2~3>^&Tx7*ufoWYZKbt5We_Y!3K_!Zq>R4N#DWM% zZOKGErF~`i+ogl?;&D-ulh!pgjl0YRb!;o63e3A`U+QI|7+IlKrHfnKvZ0$VewTcz zWa~Ehs~3l%kO#H_-_WG|etjD!Gh=YnVkvAF)<#*4ATspziuV$1@^+A}R24|eOz?lc zyzEwClSOldP_r>epFbL!O`LZC%(P9#)DjceUNfKens7is7*}`v))7*8%R7EEBHr$k?eA(_ zdHUUe-M6NxxlD3yNpo^^;rv{H$S`r3F&&I4M?CZpiJK zw!aN2?!?;4c50t!XH~rz?z_t?`HdF4uYAmv@FK0Wswy04)l@$p zGnC=7OtIXHLqKfAuc#e~_#7p7>6e<%`axuJ(|+TIYCoo}dA=6^G$(Zy0mOVH=t%u* z;de^EapM=%H_WH_GkOz9r6OsQz1xt4yw>uzAL=ishLl)#SeqoScz-0d4CKxk``oKl zjG>`o&Yk|M5-@WL52$8-==Q9fCZo63Ihz5eV!uaps_y)3z+y#~1!*{Qz65SV&*jR_ zph;I1+(}cN>f#XRD-%~0;GByJHr@Sg;;Oag z#29HTF$$UZ5%0CkHk>Sg;;s8Ts81O!qGwy%BJ#yxn!nI2^HYiB`LD(h_#0j6+YzT_^R?C z3K;)bF@Y>MVSsOJLebAZ&ft*0<51K#)GY6jEEwLi!)F;zq!UH?usbH2@{;l)I|;Ea z-gyLSGTfslGTh_OLvxznS>NIW*I9C0d4OtuKD_+u)dyLLT7?2mN^;S1n+v5c;Xh-h z%B{T8QQomT+LDrn!*b!)|{3c~PITbtNem52zaDY=ZEvcA?yOo*9# zX=wzP=j9}h1;#H-edUDE6iluL3E?CtBrDZsu&CqFr8OnSu_ku?2q!jr9FYdy|F~fT zdy>kQgm{9ziW>)Q)^5@FB9v3%Ibnevz>s|W)vK#o2xA)nU} zKkC6#F$JiWU!hLLSD>%3v^PkFk~xX1BI1-i+Oxl(7LXZuHK{Jw;!(r{E}d-ciia29 zk@K*cdXIhXG$Lu$0vRbPM;knlD2&6U7@!t)EsRsK+xs@W>#(M*rUsDwW1N0?C%q8g z$8acEPf^8qHfE*#h{j%taV=n0&ii4uahL6uR9bz{i!}#OFysw{=4}1kY%G|;OHfLv z+W)=6W%JC_CM%||(_rbhqBz>LMnou~cP^{;^<0{grm;p0HA~M>~|;2P)4kZ+775+kqvd z4qFr}5qCU0{i)<)e!?0jT7Dc_qM9uN9fM-ouN%(p6Ac$(&U*%aS-cMz@CqzWmxBpa z8LkUdCQklL@=ujJ6cNPSAYO3ocS_t|s}^Y2ZUBjXvh^Jc*Z729;QN5z$T^j0P@wGH z@E4gx*~YcgTeQ|g2_yR@XW_)jz4FtHsMh{*S#ed3#aTPaAT&`yKc7dKa+sap)t^75 z6ioywTitZj(NVoPls-wmSt+gdjquZ*L$*r2Vx}BW^53}KotFnHS7=>wEp3!XJ?pWh z^3JnKuXku_2`}N{3HA{!%o~~Z+Z7!V6FS8;TZGD3o$t{mPp5?q4V=*?sr=&R?BoR( zGO#myv0dc$#94q(R~;#wyixtDs;U1K5c#1UUD{`#cdHn^$O0q~&tV7IQ^?Cp-+2UF zgV}G3 z^KldjbBa4`hLiZNa|dVDK@u1~JRzG&p^nX~FVTiP0T|9V)zKyJjKTJ& zVWml{Rl;XGhG<%8D4BI&-{f>w>gV5C=Jig_5Lf5G&mS5a8ycS%6&lR%DB*v8rIsep{&=GnF1jOopDg(8>mPGUl-_*Zmfs{(>g!~t;GmTBGs3Q{>w zUpmV=OgZHyC8qxC2nOe$=03DhD(2U{5!FP7&@sS$e+b>f6cFAjQ?#@(Mw_ zVlj4U1ZSz$Fm1vpU7o#G4C(z*!=XfKTNG7WJk$L=K`|qyOseA?&Hv)0N^4Z0rg+$d z=(?Q{G(XFc$)qMJFTEs<4>4a*`7>G=?#%wTVu?v{!=$mE9emm$xt6m|9sdEv_ruR? zO#@yOL_364TBwq%6Z7}^C`IAlM21`w%Nhn#!8O8^d@Z7?uf^s|@mUC4{|?$kzHaz+ z=fg)^ItI`kbWP?+iQ8y!ZL5AHzC)%nN-*zmCU%$QQ;yUNg(ewVW_g7f| ztp9DB+J?wI+&H-36v$qBD)`Hx`xZQCV>_gnUM`^!%gs$p9I zZ|={r^KSM#!t8eshyB~1PQ4E*pqQUy{D8y-nW9q~A{m!gP;Q1@O4No#zaIZSh{qED zb~@GKeRqLgOri`Wd#W!aPWMOA&^Y#qCzV&6q6O$L8v&c#RIO~F%k3R|abYH$rN+v*m za%nI1*mFeoTCVc}@ZW*G7wq4R z>fh@>f5VWCtXvHL