From b8d818824c6b639fcf119c3f175ecfe21aed7633 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 21 Apr 2023 15:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=B7=A1=E6=9F=A5=E5=AF=BC=E5=85=A5=EF=BC=8C=E8=A7=84?= =?UTF-8?q?=E6=A8=A1=E5=BF=85=E9=A1=BB=E5=A1=AB=E5=85=A5=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/EnterpriseImportExcelDTO.java | 7 +++---- .../IcEnterpriseExcelImportListener.java | 13 +++++++++++-- .../excel/enterprise_patrol_import_tem.xlsx | Bin 9242 -> 9276 bytes 3 files changed, 14 insertions(+), 6 deletions(-) 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 becc763ba3..55bbb1d60f 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 @@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** @@ -59,9 +58,9 @@ public class EnterpriseImportExcelDTO { * 4:100人以上】 * 改为手输数字了 */ - @NotNull(message = "规模不能为空") + @NotBlank(message = "规模不能为空") @ExcelProperty(value = "规模") - private Integer scaleTotal; + private String scaleTotal; /** * 场所负责人 @@ -110,7 +109,7 @@ public class EnterpriseImportExcelDTO { @ColumnWidth(20) @ExcelProperty(value = "规模") - private Integer scaleTotal; + private String scaleTotal; @ColumnWidth(20) @ExcelProperty(value = "负责人") 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 5495dd6ff6..f6de421e4b 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 @@ -5,6 +5,8 @@ import com.alibaba.excel.read.listener.ReadListener; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.ConvertUtils; @@ -67,6 +69,11 @@ public class IcEnterpriseExcelImportListener implements ReadListener*~dQDKOAcBHaks=_Wi1cD; zA_VCO(wmJB@cPaF&%HDE%$%K_bDo`@ot@d)=gHS?*L_U@UpAnn;lL7d!CXKjz8=#f z1&a?BSb!fDefFzreluZCF_omR3yJwG{?DAY0LF=P&ZixOKyU^K<6gz~cj?V#Qa@bl z{rTr&uai(ZsPwU2m?R`I#r6oS&Ld(nU@p9;=s|SJ zvOcSzTS4q0mma&&khHb64RA9x%}Qg;Xo+hm=~!c9zO4$kgipEB0WzdwU*ZzanfJE^ zpT7}&u4IFxpQC~ewmuy6mKnkCb!%xYB-owNPd=^HXU~>YPsvtTa~#^ zeol$82QTNIYM0wM6(100=$k$L4=hb_Pnb-Ky-fEUALbRuyYG}j;P0V}FSkdP5BdUf zLAR&ls-pVE`jzIKZ*{OKGZ*T3U6bK49b%&jY67Q zfw2361z0O2OK_yw;I{-W_3U44SN2N5xMxzQqm)Gi9K@c=(=!D~zXSrg5C$N;K$?X? z1{n$KVBG{@A)ABaJwN7fGY?+Rjv}vf@afK-j68NLu+lfz9hxIHB~W@_W#Z)Pe$LS7 zJ}y9XilO+1Aotf{6~A|GW;Qa3-Dp1SejdL#B7f|sz+tPBm?wkKFfF1rSvnnn>kT0C z4dXZCeg;dPWFnX`{39V6@tc`|ZlK@ESI)S?lt@KEv?2_ir73G6x*J|ZTQ1Nyv3_08 z&UHj9mAO4RN!U#NzEh#YSGmZ})!tm80qxC{nWXN1M-DtUkBhWkHXT2-hx#bTEPv?c zocf9NA%9FjMbn6@U@!MOvtF7x&)>bWOtwe${+c}D$fob2^2AZ=r+zH}%jT^Q$@QN< zPSC&<9b4LHT zjXTh%hRkc9{N*!yWP05+77#M;yMV;DeEBt6-KE8(S9>9AAAWT`aiq$RA^UVXfnrIC zZ`b5c&G$xMgwsq}wf*Dc`8~K+xx(S|a%&(%n9p09!QvjOcYRbvfS~IVvS33w=n3W^ zqF1j{laiJ5p+dqnbE!fpx*@dupL;?dlf5z4KNsBiLiW0dkeiVhiCpB9MkPfz0@Jo1 z<4HIPQ=;t)<`RD<_e=NnnD#|if%@V@gAXr)(8fAmb%^|+4`WKtEp%*gI*r?jcT=K$ zDsFzMKrGZl6%MG!fmetn$}NvOSHDm%$3(A3)+cK}+m;v+QTYxH)F={!DS`5~Y|@ns zmkZe+Q!D057u|DEn3Yd}m#cK5nC;_0sP&|hk1gbUxf$07Y zxDYSNfWS~M=YSg_-d@wT-oE5d%oixTKQVT%BSl;c%0vtdC0y&hC@#;HsNJ;dLP8qR zvk;Mq(uye`X+F>V(CtjHW}CAZb+u=fGcSwpcD%%9{>evl^0_-;ztNHT6Zg%ujGOS> zk#B|Ex>2|RsQjG2<9|NaO)~RQULK%3ORuc?WYK#VuD*NoO5z)+OBN zyaaB0-pC)Gb2SZ%sQ5H}nhNa18lN_KraYB(87`J#DP_$;1?QaRh5ZrlbE}aX=eU3M z(MxUj*FZfA8qr62_lnXpvA$}3Ch=bOl3J+3ny

#CP4on&nh%gy=H9M`h=*nG7)_^~v!v8Du7B=_-_|z> z*X~JFktO~BtDqeH_MOWD+LW#B+A`Omc`mG z8%&9lN6|oQjkT!(MezcM!BsCQJ1b8XhwY-=TK^koU&Y4aMw}!wm!D_ z0=*Yl{hU{2Jhx`ztf)r{FYY{KXYjP=BVKzLX{BJcng7@_L0!DHxqeSE4jTWeR!e}N&G`*c`MuPig6ws7ox%8hXVDcs1BVf+TddZ z3pv_oAcAQmwPqyZi9!J8o*QeTk)2DJtYp^mOuO2X;A2MC<<*zz7se@BGddXl;*3Hy z46kBRJ1X|lO=Q0cyHaGZ%0mvdf&9R~yHxMh{f1Zm7-qdwSyFY<_{}Ye(pPm?M~>TA z|ACt;4ndJ}h4K#z(H$^<3PsHUy~64KD5-_RLIKOx_L1zopE73X75A5hxO*}!0yB=- z*KF~wTX2cuga%Uxcf*uv`O8_CYeXxWRI6TbQMkRktOat(4}~PYSma~~E+oA# zxRVQBpG$1^GUl|$rOiU49naPPBujKbjC_V|GK^rPk@MbMk<-38SBrxO3;X6j3uQ{3 zg(7;WXWf=+%yJ~wU>j^0wirt&CjAL)}m+{HEP-J(zpq zD-`DH6}|PAPcO+R3Y>P$6@I7OPIfF0DokTIFW$5f^I6|sB`)p79Z`VZ^5MF(4Eru~ zhm%NY)QO->-nJHvZT!Vb?5U7{>*s7xf$&;|Wk33cC-|}z?lPJ++A6K=^3(U1kx$s& z=(Rp`;Y`@%YOmE$byFU*g0T0wm+P-p#}d}Dz28xCy0X;{U1=|{z0NAx*10AYl{FD6 zkMiO~*geMiv7|`W z(}Q`;qu)fDA>|SxFsT@Qe#I%Fe_opsEN{%gP{k6?cjJA3v*n>p3zkDWtsJylIZIaN>dp~|Z^)ADLKi@QE@>6Do-!rR& zlf~z+FIKH6+rK&;)b3%~i5C*iT6q!Q*9RB(F+i|v=+VJR!);8|??)5|S3kg%b5|%s zg;f?ZG>ue4FYNsHO~hj|T^XfN`b~0A)V^2<#oT)d-V>QUcVd9 zQ38Yy|E#(SrWvxrXZ;_^9>g!tnhO0e7f}eWJV8t-~cD!`wrH5i!QZIc1AK4q`2ng!J;(Xc^*q*(mPR+A!kRc z44AKtK=M@9d!_S@dzcKAp?UHYxIu7AuNOLXb!a8Yz$H{uKjmAwPI>V;4!mUo&(dF$ zo5upTi_Sui3K&YB8{Ycu$uBaI5Y_4|^cro$&u@vF&jc` z+2VhY(7ZaFxw-_AG7YNK5SO@a=&?0p$&?!)&^A8LR?c~9i+8B-c@l))>$0sxi&z9R zn%@;*+BwEE#l4vs&++p*_?#C?_h}fN{^#WAm;K*VS5O;>t9emTuBZJvgnv4p&c9PW zKdC}nIx(<`XBmx7@EJBV4ph8s{Hi;lLes2U6+cCfxA+-NSmBY>l8KWGh-_5St!Ssq;IC1q#U#w!^7r)SMnd%D}0O66*{tQsTtOtUZcy@_7lD|`*z(t*1O zPMk`Y@-(4C^`L5>cBh{8i=od0^9N@vQT31&OmP^Q$c=7EOdm>LL`wqJSuULMA-?HL zyCT0V`bx+qi{u5bJR9N_o8BM+A3VmeD9eQA{`}9TMqTP&=Xt2hJj#F*S z>>99x_RfxQ@mu}#m!UTpvEKkg)?ktb1b{;rkPFU#K__ZK(D!=IYEC8M>Uf)@3dc`| zukYpwh~8h5Eja&Oytq9&==LKCCE{u@;BsB6@x7iigJ3%mg_DSRG*GiPhZSF@x#U$j zoD#HucG%O3Kt$6C%1Sp^2~a&(@97z7a&tFT_6;eU;Kh@|)^5rsj&BOwp4|R$-`SoY zs6GSOYHJ^Ng$paiAu+Iwd>uS5$24Wdr>2RPVx&X6cX2EHi!hzxF^sn?S;QdM>|5BG zH&a){%)$fx$rG2NubJkz4E9u*dz!-^MgH1l5Zr$JxE8o`6DhbhEG|4X6|NEF#y^|C zp(TBQzm+-;bx6yaHCZ3F!)T{7_!($i7x^ism9#kIB~VyLRogq(08hQbn&J>*r68uX zKUk=opPiYWGgfR7c`1{lVS`f*LXp5jh~Z%-p!h_=`viAB8H#IMgd#rte-$PVq0?zfnioz8Ti0wb1 W|DqZogi#0w0U`jS5y2uOS%LBX#we2x)gZ& z{x|Q`yb7t4-1FaX!Y`wMtHNYu$*T9 zP%YD|U{3{j=981lF^i0JG>}D8%tzGG@pTOj_Af;nmi-iPfs52(;19*3AMTc6T*@0( z$&%W+9tOjYZy4o>Rm@^E#w|P$T1#YZb#L{m+fqo8RPTkg5)xU>bj`S%^sKOlEpr*v z;TfmgN{=kKVKFsZkDh$GtWYp!55E;ALa4N|jg>AZ8E`EXqx6^{E^yq+^-Xb^A+ zVp`SYt6J1u)(~l34~DC_3{&yzm;Kt`2t);;xO)6&9IZper>*VMq(@{kE8!CtXIq;u zdOE3M?WespNE5~sTF)gnMWi}axSrsvkTzNF+#-eXc7BGDyR8a?eO7<%6MSvBgF$kd z@^aw85yjt`4#>QN3&sMkx!}$^>X=xR0000F5UI5;YxKlbi3`Du$qUO!d~PqfkifAl z+ot1k)KRx<@E$%@FwJuBEwn|+*Y<6s*Vor)#l3d3d@mG9?`Y#etP&;1?CF@Hg?2w~ zTkgWbntjz$>W8!<)|v{ja`i_@Cs-#T_X~)mbZHeb%{9cSK6}&$;dZ+a>yz%N-Ryb4+cs8i+=-;w@0X7fe=`7u z#6^R+bOmkN*mt>C3Q+I?)rbxhs72z>G-u1gl8p2AR$)v&2CchqIg2`rX^&zWze!d>e=5isdp$_1tY(ycZvZrm2&q{fk zepy(xEHw(+jXjyGyfDe^SmZy4@eQ5U{7CFkHx~>0dHDpn$4}JA4Eet5wJs*Ip_Ad1 zgeqYl+%9kLhCT*!e7w(P}Y{HJL3s5<`Wfn?lUJ9N71G9)z*qquJ|MP z*SXi_%9#}!yBN2B)A~?B8XB@N>J$&SCD=^EYFHLL4RYh1inPudp+<$U#J!H=MnuDy z=UX4kIJTk&G5<(EI|+z1%JB7mNpM^D#%p;lee5L(Yg~|&UL4LZPeC@q^T?9&yOzuk z6h5@z8HPkcCML@@OX7uu`O@c>O}3|Q54J&S7hYe8*Smxm&He&50doUA|^BgJ%f!lY6nKWpWkI!z?pL z+++_GDr~~0(Q=7RwCzBbXL2|@DoNu?mt7fhLQUfDP|+@XQI(weuazA{$#^{bQaSVW zl@El;%02t+K^Pf%aaNTH!S;p7O4b&Ro)9eRH0F^KT;KK&pzuamwtd715}?t@qItol zz!1To3Q8paeG*`F7NkEY_D$7id_&Zu@|sO=9luK$pVW*jBsPP;HU0BK2jdU2-tnE( z&t!&G1w>I3r5suoJjguE(8F8kPZMq^!Kjwao}_J@O7|qf9~VxFavc= zTr{G(Pw0bH>viMyX{@KUHA$vV4aF6vQrGFlhGCVQvX94c3^39cj~)<|PCmnojR|Yf zF{s zNRZlWph#HmLeGA`P||e$6U6Uw*Y0%KDq2~ur3q4Qkg0C(@@}bTvw^lY+{{!t#39)x znrqNv$rzf~8%~ZgF~nbH_c!i4glY%&yFYC7iuN+o&y!_F_+OmJ?feK8AgA^9to-(V zM!8{sPDJ$2&>*d%MIjSR<4=jH5L}($W@`)xeQ8f%TS-IMm0~(9n!>Z%=2qyc?u*Ir zU>+~?`!aQgxKfBqctc|Ox^c&98j z;QrCq4ZHn76Q+hG9P(s?r$gFpkYO6}rrqZfuv+gNX<^Pp_MOOs$USjI-0hATLbDH1 zZYgqcZZt(z;M_;DpO%d{+(?0;4#@bq2*pN^^5tRdk$oN^f6}m?)Nj@1?m`w>)1~$^yuiQ&VKvLcH#CFDmax@1SpE1}A z)fVMp;mvcr3(`Oh!q>^>1Pe`Tp&`+=X=e1FVhJku4-b`|-X-|GUxU%8rg7L-NTJPa zcSh&O(!_9(34S$iP4h<&>N98x3DX`~JSl)qsPEaR)czWVZS{X(P}JHnJ+7BebY^6b zeY>e3ooJ-53{Uq)hhHX_tt};Mo74Lo0gP+rHb%ssD6r9_UdMYb3y*oB=55Q0tV=j+ zt3&+o!%8ljjJEH_yuFcn0P;H(Z)KrgU@Lx$gvKGq7RU z7Mh-~o%1_GJawU(5%$f^(R+Lgngq60^%hjw)bGlSBu%YVm&s?h*1J78)_DA|ki2Vl z5me3TUC^VFkLPg6gW8|%+P`UFUk;m^gmTMETs#d%H)24psr8_iADw0xlgODyXZXu{ z%GOX%F!kk$J5`^W`PO+S=ctd#BZ}Q+X8Nu({%~-N9vy!)$KOLNW%IaO_=U&S4+=-=GcyNF z5tcKU0l!d#;F;O_sCZx=2dQb-==pnH*4`?`54>nENUnPY3b7lA%$hZdz2Tx5ATU(ceU99g(H=cw4^9v3H~` z^j27=wBvO0TC8vI{?=gm#cnn;Ajdy{k;x7-Xl@%#F+La4hpgKcX_&ncYGR+WFh1rd ztop8C0w%F3R|h4xBmVvTXSGT8as3;2p0eEp`ATMJADsbqW{^ zJ@1}Nvn!B@&o5O=drvTlgQfVrdj=1Y1BZcPo`XWCy=zbu&I(oX%$Ije^ghbeI|HzV zA<(C;@rGlU;qj^guWEJYNV#9@eNgW+>w94K(Zo_^kHD$~xl^@g*>$j@Iv&0-&cG7^RhYbLLNYx(zK%$n4mYXXsvE2UyaWFOPUEbFkZ;dya; zJL=YghKi4%5q_?!Fp6fVgIe$yh1<(=3)ZyyU<}?WjC^(33ZGALjSu%#V)Pq`X32xztLOH|^<%LwY4}0%`=yo8lt%9toAHwWlT)SG(zO zu+7vFJpRIm@0>1($}#_|Q$q zGmYM|?~UT@WOC)IYAb`o286J-av!#_X zeKsPM!PSSIM{?aoW$zzkxLSZTmrb9`IuR$i|6yD}y1qwkBEfEB z7g`HS;R1hMS~uX1kYs>u7peRAzyS9RXm;M1Iyg~UY?>Cffee$swB!I`@;D0&c&u2h@>PM4~>ZjQxo zP6m(t8vH%tF54jJsEEmJ-g@?(}7n7(PIDa)z)5?(oHrVt;(E4uKGKb653E zOb_H>2%{uniQC_!h3(XQAzA8Ej3%Gf-(x|-eN*t)4gucV6F zozTJOvO4R%2TTJf$%pvEuP;O+YwK_|n55N@XjBVS@dLcJZTPams(+iY)gvfmeZ;~s zh(RtDNK|T#UyJ{+mg?I9)Xc!uKQteUV#fqsn~P#dZcr zQ?ye&Lua@dA#1OQM)(SC@1oRksfK)`slT^PxuX->Xu+hoX2w{^qqx~xq_JTxL&@3R ze^HRm1bIaO8@&`&3yAuH`TJpx=5GGP=cdr+CbsvXW{Xp$t zx`60{ErmZ@8+Q{LeoP31SzVL#&eW41|Ag3g6_Jt4o`s!SAOi|!$_!||HWb7BA9{%P zz;||PbRe@ zoMvOQTq_GS=zE9i`~8EKPghcxkphoDRIrdsmING*4ShQSJL%v(-FjQfk589Q5;mRj z)5HODxA)iu{6^yhXRYGBf~@#cB1F4+J3?Sw%2p84y7X z^awXrZlD?>i5fS_d)0U{B)Y@Bre_D|@q(DC0v@{jm8{v+gw qfU`*f!x0l~EcE~DAK(H2kN-pZA65+(Vgid6!O2dFbI0^==Dz^6oGC5<