From c8fadc38e8b6f93635b38a06a7dcef216d3f40cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 13 Nov 2024 08:01:01 +0800 Subject: [PATCH] 'commit' --- ...˜åŒ–åŠå…¶å¯¹æ•™è‚²çš„å½±å“20240419.docx | Bin 162 -> 0 bytes ...˜åŒ–åŠå…¶å¯¹æ•™è‚²çš„å½±å“20240418.docx | Bin 1530309 -> 1530321 bytes .../总人å£å˜åŒ–åŠé¢„测-åŒ.xlsx | Bin 8973 -> 8973 bytes Py/TuBiao.py | 2 +- .../dsideal/base/Tools/FillData/City/C9.java | 17 +++++------------ .../Tools/FillData/ExcelKit/ExcelKit.java | 3 +-- 6 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 Doc/å…¨çœåŠå·žå¸‚县区人å£ä¸Žæ•™è‚²æŠ¥å‘Šé›†20241023/16个州市报告2022/åˆ†æžæŠ¥å‘Š20240510/~$市人å£å˜åŒ–åŠå…¶å¯¹æ•™è‚²çš„å½±å“20240419.docx diff --git a/Doc/å…¨çœåŠå·žå¸‚县区人å£ä¸Žæ•™è‚²æŠ¥å‘Šé›†20241023/16个州市报告2022/åˆ†æžæŠ¥å‘Š20240510/~$市人å£å˜åŒ–åŠå…¶å¯¹æ•™è‚²çš„å½±å“20240419.docx b/Doc/å…¨çœåŠå·žå¸‚县区人å£ä¸Žæ•™è‚²æŠ¥å‘Šé›†20241023/16个州市报告2022/åˆ†æžæŠ¥å‘Š20240510/~$市人å£å˜åŒ–åŠå…¶å¯¹æ•™è‚²çš„å½±å“20240419.docx deleted file mode 100644 index 5988520c8aacde1da98295a8f4e472deb45cab85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oQfCFzhiQnQSbt9wzUHTgR0WuSFxtI8DV<(q@6$gs%Kyjg$V#@04C%Y;{X5v diff --git a/Doc/å…¨çœåŠå·žå¸‚县区人å£ä¸Žæ•™è‚²æŠ¥å‘Šé›†20241023/16个州市报告2022/åˆ†æžæŠ¥å‘Š20240510/丽江市人å£å˜åŒ–åŠå…¶å¯¹æ•™è‚²çš„å½±å“20240418.docx b/Doc/å…¨çœåŠå·žå¸‚县区人å£ä¸Žæ•™è‚²æŠ¥å‘Šé›†20241023/16个州市报告2022/åˆ†æžæŠ¥å‘Š20240510/丽江市人å£å˜åŒ–åŠå…¶å¯¹æ•™è‚²çš„å½±å“20240418.docx index 7de5f9a34584b93d86bc200e854f98cdc0118518..b7518671015fae25ce3f748cef247c687be6e1a9 100644 GIT binary patch delta 10498 zcmZ8`1yodj)GaeZ4BZUf4bn(=BOMZo0)m1xDh)%ogv6yKMN&GXJ0&FqgOCtult$j= zKYVY!@3Ge5uD#FR=lp8!+;yj~)?%{OqUtXkL$(0f$&hpor$;`}U7V)~kefOq)Gzc7 zJ*C*l&tqXMG_)5{tlRLmp^Z2dX&>~+9W~4?ng~)X)A==8H$64>t8OD!lV9n9y4{)J zCy#E!>u$3};A;>odQioo{Ps?p+=mPEiEL%U(b8nBSW%Yp3EpgM!-h&- zNDEB@guOZIcB=j$Ew9xW_XGQ^>X@Yp7^f$6CsXPK2YC$CHHuXp!9Q`Db1M_GT3M82bmM*`*rQqdX|F>l>3W$mHeo<5 z1`82nBwZ2CdI~prPH8j8xU9!Z=7f>&g9atwsv(cwrH)48Ta}szrsV_%mQobDx~My) zJ@Hk_H&0}4W16f`pZuO+KC1Ct)K!Jt#w+c{Y)HuiTo}shY*T)H= zq_n(aN*M`A3^UG}9O9YMhTrXD51B^DN$n)l)sRd>OPRZq%0adw^x#I^2+HLBsE|JGtEMs|^Jw^aLIl zhQ*7&bZyCbI`EOK(sajk4nq4Rcq3OR!^oia)FkYg*26WCT_`164=d@iAQXrDD~@+x zX9e*FlF)orFRX|?JQ!U;@Q*9HXI&_|gw08Kk{m(K%Kz!$~{whBAh?hfn zBj;8`tpO8CG0YZgUPRURw$U^scjP{5i~MegwMM@Ay`V^-l*c`H+)>-hO3yo-%X)I> z>WMGAa~6*iQsA+i;^I+}BBbIfXf{BB=XZ+d$Y!xj-7%@TSHz>;G*4v3Xb0D|2fn}8 z>)o%ttN1j16c#j@u|(M6>Y*2oNj^HpqOK*&S$Td^Wlzz~Tu4;!_l}K)W8+1-u)ELC zh4LV2UFKIdhb!;($xJ90#5p*{893mZ#*A4c3B9)~6WVUrb*%CXCa5XkQ}2Bq@v<9F zD8!}?#$#Ec9-OP%A7_g(mL&V2>&v94?_|(5YYFkY9|{)9Ontr6`R{0c1evN@F++Lf zhkJU;J}Gqx+@s|#zFOHyoi}lK@zcnm)7^a+8Mll`igu?O59Xs5@DCnqVy=Y)64-YC zmfv(Iq2oiNgm`xnkj&DwJt>{E5+lkEdzXU3`*%2gR|H91bIFMOC9 zARRtnkTq71|5LnselIzH-ZU0Ho&FaeN6#Z9FTvce`=?k9uFr|;?3v*7M&*|h5%lDm zVa9bnbQNuad+kCl&WcQ{rkfSyM{DDoLp@h5zH2ioM<>PWJr3_p1>VZ35(092l}iLC z-xb~-b_@UchrjSp5OD6=KMZMhU#9Yr=|EmzByndrEqQ$&q5E?{Z|)Pu^KQp`)9gpr zySy6Djzg~^KO_x#KtJ3!Q}5h=c)UQZtSEaxJ8-=}PSl3Df`Z4lQ3JZ;s4#HV60>9} zFCGxT<|yCPd^za1FK1cQUxX2rT3N7DwmyUL^6HL!YIIr3W%LzhooS$~_T(E03q z;G>(BbQYU$B}x({c$b8#tC>WO$RNMS!aAAFj{SKBUWuEY#CM^dmIqecv@FblJ>$?I ztytEmDiw)8n#CC3DQhpD9!wF#3}5!NO$1_Qyjy-wQfaL`ANPU#`x}}$=)BW@GIE%Y zVd5%2WndgOBYSx=y&Gp;ctV#s7l5c5gFuZ@*55MqOK2-@%Uq+{3EBO_dQKxEv>PGso1~NB3LFq8NcwK z^gC~7TevId=GWXzCFQR4pmxK2%?ar_S#+&TmrX`J*sH+c7mJ6!-`|g>GGWDeQL6DV z<1{y?{BhlH#s{Ha65+&8ll&V(*VhmkPUZp2?%~!)Utfip)E1W~$ogS#{G5V*up$3c z#De{be_3ztTJzv%+GapoeBnn4czEJ?_pC9sQ z-RqeedHvA$9k#cey${oQ5Rbj41E(0n&~ z_v-1moS|tNx{m?j@#u`0rdPDHbZz!eytMl+I9!$I$~3Incs|0@$qk4ue!u+itH(6) zs=g}N&vLc40T#VKmaAPq`Qu!1o_DIvmJ8eEjC*GTubtu>eR__E`=r);u-1|M3?tWE zUZUwe$&;B5VFGi9QFA8W+kcGzs2Str^%W&Qf0hwSk;4-2d?c}9eyHMC*C!_BZ?~~` zxJyTP5#FY<&Omse`z2;P{H*_8L#Ldd2n&;SNWd4|Up{f})XzAjw2tnb+O2JTqsfWw z{p1^#cZ?PA#Wk6#sKYP&$lcRIk?gKOh5oUaWLV0% z%ge0}QmJ#L5g1;mRT4|$eB$HRmkhO%Bt|drFYLE|46>u4-2@+?&kf#-nmjwZ$fVXwmmS-}(>`Wn%dR?5*G^2@T%3f2k(Y8Y$1P0FbVYI zZsqp^M-p#4_I6j6zvb~x2+yfBvvC+So`{T z_sl-BS5u9_hCI6}Uzn2Z`n76a{nn!>CT|Ai-`P#C4(ysJFpzfUi0abwAx)DKXhATQ z?_2DVT684DWarE~KO*tFaZ)xX;{tw2Zp_tWNj8EyD1a(sRU$hWy7<(XYb!bn{fGSNfaTvR(SYdzIN;#Q2R zvp>cEq4Nq>TJj-3?;>ytedEPZBb+Ga-YWgllv%0)yWJ8y-OcEk ztK3Wv#=UF)jK6}Amku#D77ImElAKv;W3wd@2K~;2GUM;3e>J`>DpyBPORQ3mAdD~` zN1G6=J>>BETJEA-Jqa+WKqzV%dxfDmL>lWW=jdo?G$epRF@zD&3qXe>&l!kL&{rMv z`=e`1J?a@1V5A*9CJ7Lm$vEFS>a+KO0OCjzJ@BAL> zLGOQ5{qjm1*(&>5R-Yul>h;8!qINvd=GEb9MBn!_?M*ahgr-fw|eA- z4=J*U18R5Frqbz&d5VmspK`LP-sgAt-D+xIe$lxX%8C{588vQ`Fm%AfR#52KRqqyS z<1u{p@lqmFm}$K5_qj{=zSO!^@f75d-r9x1%CvAll6N<{f&0^@m&1O74omp-H4NcBEj7ghHsBu z_~rh!f16vp>cRKWB>W`(?b5TonZG%2#y?=}+h^I0lD53#Et>F#62;=^*>v`2wXgmy zOd_Oemh2>*(zpii4ld9d&x)nqxBe9qRb-pW_-y2be`;Ir6oPal$1Irkj+*G_J6KUg z{OqaCwq8>o7}Z9QhTrx%1^@K*?hmfR-G#np7A)q!TnuRQ_7kk8O=laNbl;H3VGVCj zqg=NQQNfU)Ds9Eg{N|HtdTwo<{tS}JSWxsT;!F#<6>scG5~!Drt(Az|zE~7hOMjeG z{xs^(Th`#Fs4h$Q+0Irav8{~p&rd7rIbSP^rt`$JeD)n>L6&(C#8F@vyl)qg4S!qv z3s0BzbNo<>(;p1n{&#&<|KeCUzM)(QTSy{KIwzJWs|E9_LZlDtZ*|SkiZ)A-PbC-9fA}2UtK5G?@``o( znfseWJZe25N@Phwl)JH#JG&5l`FpjRBx@SCE~qBv9Uhzf(;1?wsMrnutwcvw7tW@q z6M=8K)HR+eH`A6LVOL25`tdd))|1bl|AL(vvUOgfV^ihGuggg!R+KuAa^*DyMK)aOqPK+m$4KTJapW& zCcj2~N-R+buC}noT%X*RBzE>$;CB;*3VFxlV|06`q;aN1KDGierT#tJVF{l*sRwu} zV=q{|jcL*fWW?(R`T2z=1@s?yHN1k&^0?|VQVl2ztI_PygjbW&OnhbQvI=ghtXP+& zb&8_lll8(DXZuO*u>a6~+zl%>Gbl1noeR^Zw%(X90jh*S9qXCKPIm1jW4iN?b`zPB zXvovyqFDUotKfs^5b-8Y9sK?VrzDT50r(l$BN>_YKgLgNKU!eRd$VJZQZ#*VYR750 zWAfmrd5wK|U;S5usoTce?(R99pWkFVQp~B=T6a{1FBgdh{S#sIHe~tLN{LB_cbk!% zshqml+5JD+-_-^asdBRXZ1cT#Y>)AwZkiY%yC#{o*Rt1|X3nlEqbhi*EDbr7JvnRq z5d>L;CTW%v)VdabhGN`&?W+JkW}ybaLk|qT|8>g_hTR946fiiF^vb9KYXuCZq?j^l zh#cT%jn47k@}~+xDWFocfZJb~3}g@pjDoO$m8l^yfWQ-UcE~|UY37+StPUl zH_Z^vHWW)~efO>B(`E=W})&1vWBp2b+qWzn0`&aHiPxHx_eXD!~D zF>dA~xCW9AD7ukIg{b9@gX&X}I4l|7NAhu}UmN~Te*4w1IZMQuU`c6~g`WG~M5X=f ziIV2E;o0s6~+5xSYi}WV%t$sb5+)WGVuGr|@@1?`uatq+`QoUDrdkNI;N zi~T9Z9b4r-%G{9+dK1%1%jn=T(mKZ2O_^Ab#X%X~0LC4B#LNC3_ck3D|&qi4pmoUy6g=8ZPR>&KtfaoAkK!p?&cRt+^bx zkb9V{eNf8zL9EC7i0|~ex0t`RW$<{%IgM8`x;1NyX&YHFv}G;y)Bkmg;|oqx`Gu4p z43j~Yhgxo~bT9KLvhe&WC@~%qT$I9@>Urf58c7}D7RjA%?uBoGr4Q(w8C8c5)VcPK z7rPNucEsnQ9nY#KpSE*10&InWyRAb^wU-t#K}B+%HiPA~51;uzS+KJEZE~@Ld3=eS z*c^I-9A8BK-7^!zT>Eo6pR(0}{dYO1b-u${uD#rO?Amdp@%ZGB@c4ZFaQx)*(}2=zTU6OBic#{Iiw#T7JGggNuSk%Z=z;kg#z?_Ohh!>#qokgk+`2>@+1fJsVykt= zV^nxoGUiO< z{w8G>WNNLsIgQo*s;EEG86)S0y=O*wk&~*LZi7v_#4e%wk@3OLIoU{5{NCurF@0yX zl<8fVjp&f=BlE;w>Qj75 zcoH?yv#icpH}eNpL=I968lS9t7sjNpxK(&JI+4E9ku4vH$EEd(1_PwAIJDWUF$n4T zWx9y$U*?N5*8_}=dXe=(hcF>x`KCO%ra8`ZcGI1qenlGrcs_lsWPE6h}v@gDKN@>Dswn2Z}DfTQ=RJEV0 zfgss(pL_Hj#dd<87FI%eTK^W5F|LSsy)Di#aVZkBPebc@G1CC<=(~hB$&mtI7=4o9 zBW-%4x_!hBFr!jarmDHw@cj7xL3XVWl zn9GX;n`%gg@xsM*Iz#l8NjU^A(1lswf0uV$A>)P^u`?hFzlelEA)N#*1$87X zZk$;rk)2h#GMj)7SD0OdyyzUOYAF@O&@hwvE(R+mLWRw>M29(+J(_fjY6UAbn8;TcYS}92?F> zp8&%XbdBXxTS{vTaWe6BvW7V1oGWHeK7GQ(u@#B@>Il`bv(kC!FA+sQtT;+nk?J&p zPExbrHa0ZYx@h%FPF3r0pOls0$a$sOW9|NJ?wz z8B^8Zay3z5b$a9QdldG)o<>_e5crVwFuUyQY61hZXR%QNJDtnvy=nf)rCh|lA)-vh zgP5>B_x!_>CyKd|M|o>qL@xW$l}bmdRbrIp<|=lZnWlo$KjLP1Br)Bv{p(lM3o0kQ$q8@5%>QupmL)HWXw^Da#d_kEX_U&HM1;q23GcDc z-w16<<r8qSB=NSg^10A-L53_Xz3UZkf9m#hcw@k{VN<!j2Fq{6W5$YLk0#&C+5tI&-fmUcQ#G>w0@}Xn>l@G@$}nY z*pHrA0=iEzWpgL3$nG$Y$+qoseUqipB6Xw*ZvD0!d52!q-Dna-SZmf zYxsib+2W$}=jjliU7ZMReegvY;!BVJt4Z39$Kkkn%)cWF`D<(YHa@wXKb^Y%xRtsr zRN6G!u=q>I;g$9{g>loT!XU@M$KJEwV&(47Z3k8pKOw#QZ*UfARV#3@zc0|gUafX? zD&5b}-z&{d-~UsZouU7;^teZm%ZMpOM(+@UWNj#F=XU$q=P+L!SYI1qJgsaSMf zvh`^{TJzLNiZl5LPqobE)(%%ED?p3oED}1xlUYx44TWwrC$@6p+t}d~y#8`##$BqM zOtI@^7W5bA;Y3>OJ>`_VuoL6pYEs;ZuPXRf87t*=85iqz8%--K$dqx&v^c#re$KsJ z3Fk1Y8JfxaTq+;RzdKH17k26eVy@D$6L3fuPd;;O+lSh<%$EG>p+MA8+rsaw9D;37RaDSh(NJk z0K|)+MEV6vl4SOh2oHQ6a{H(C5?JO%Cj&$n5PZ;MWD;>8CE&+^;D(xp0*O#K8PLjr zAgBFbuUr4e`rkDuEGclG2cTp`@IzC|Z)%Yyb(UiQ#!=vCGMT{9%-4ZMNr7BY0eJvS zFd~$pp&tPORv0g!$OO8Mmj81B;Wwal3$RiGyN)n{!;#y&83H*##EjsB*a33Ph=))T zO5lJMK?+ncgXKDaC1!*YjFJli2y#Iv0a+FVH%yWn0vr@k@Bjha5G){@1;GiO)kB#U zSZ-Qa0L#o^1$tHlKaAY^KPxHlOHW39NGg%$gLyz-nv2#;h3yLz&$K(gOzq2r|I;4ygFc36gEK#ADh51fJ#1aZC^jQRqyeE>MDSNA7KH5g~CwN=MM#S06%!75wB6s zIexH(PvWhKP5?xOZ(yi7`3Qh>f;8QFJHZ^p3)mMxD8r^kZVlHXU_m`Wu<_r~Ti1I* z&_#EA>)I6rD`KIcqZV9P2t-!s=%@*K-=I(obX2!lA<#F(i;fy8tuUDLy?g7k0uf{e zNE8N_{8S1ZAeKfK2Jl3{owa;&YtR${4GWI9hIkM`M1T$v&|up4&4~V>@FzkD!naWc^BLx10eA(xCDGZP|n{s zipbUf^i;rIG4P0%0ajw*9vuN4V&ER-kONkd;Pz38gThlP41ky#g9@+_2Zc01yg0Z$ zuN5&+LxM_x=aEwjrB?$1EJhDZ-3;XQ4XW4201q|~uq6RbbshlCa?@l%60O0}e1sfy)Kd-I^Xrfvv3DP^}6;0PE|zwf?$6d)+9jsx;Ut;@7P! zRvL7f9HLy4Ab@-XATr<@|2#p-U&?@TX?jf5d_Ky6m7a58{%)2`}b< z6Umnas08>G5Xz88z)SD~o7x2>YT$m1D}a(q;93FPfeB_TKu`g^ zKe#J`6Aa-8CY3~6ieN?^ebU_uG( zBJ6!@u=ECN2q=R!EPQTVk;h{|LW;aN=R2@`O0g>w90Zxwra@D{a~Bd-rKbze|Sm_BGYTR;KsMKHZ| zla~F8VqCt0jDP{ignmOYuM9xL(03F#{|=@nZqfuxC`N7xWEc%W#%LME*cyU{j1?3Z zSpn0XH|eES6oX*|rrFm}!1x9@uA@NqI;gEO0<|?8DCX}?`g9WoxPF0YJ!3E}yMHLh6(+RV%Cg7!_YPgoNt3^`TJm+U>C*6?Sf3g4P&&2VrK3mXlVZLi)8R8apM2= zjFti5njmDsuTf1Cggg{}1;mO(gb{x>;;HT5#U>OK*tnu4{{1*n1W<5uwaVd zp!>g1`OyEr^|(m_^6w#UkraIA!kl-R{NZ>fCdF(s4ZjZ2@#caW+9Nx&*}(x~Y+`46_nnx$o5z+2~W%=p9S! zGGterL~JY71>k!+Aukc30+t6a54ZmLlk3uU>Z(2X`+0x`wX=J#F&Wh(HZdPx{Y2iV zle4B&=IG<#tPlDEGH9VICyD6viIcgUKYOv&rA`8w15a9u|KO;9avUX+{WkognTi-G zCE5{-k>MxG5%lo2W&7qV!CpEF@4&&Fxf>W?V|J(%4F<}4*X~pp;b~gF$uY;nv3BrtQ12!B zEo@K4fged*JfLKPEGj49e745O!A$X;Ca=VtEJpF$aGBX4tBMIrf?k5n(k9!j@M*%c z@x*WzW`hq1!8}|WbZ>GxWomg;?3=>&jyQy*A3e3X$7I@_-2``} z$-Cs#qpB9>t!>-o)D3H#qkJ%#8S*$HC8d&f1tw3gBLajg&~*%!6^!!Q-&(i?ts}B& z*PV+EScfS;RQMW|6%h7lw3rZkjJ|&N13uvYB8YF|sm@>*Nrmbw>ZZvEJw3~*C&DJk ztpx<}Q6}TNvv!l6guuSxj7{qaWoD<7m3+ypMDx01tI%5p1`Za7aC)8&Zt8YZIFaBN zqCl;lN{2t>wrD4lh?4H86Qr8N&pY(@Uu97}%o=j>JK;{wchlwJ{hbkmJ{?eN6p&H) zw!*HySFRFr&0@VEE0xFYF&UWzn z!?456rCZiU=*G^GG&?BfLH-kMmWgT4l5xfwy3H0|7n3AQ7i+KCDf?|Ci?fbhV)SRS z)o=!9ygprgONzqxgkdoWtOGsy??mWlRffnO+{w0}64v1Bv$ad&W6;LZ}xiz-!)>2>+zOPdQPrOE6To}VQ|KT z{%pPq*X!)({gY75=$)QDdFQJ9?dg&d6Jkuf@kg$tBzw8R9MilScsu#Z5{;qRrn>HI zQKYWf#0@ktzmZek-w4m25P?=ip(&MfP;pBR$%DVOa@R|<7uY7>mxWrD2B-v>)b33% z2U+veT8^wqzdD?Lz5nTTEn!5QSAncm97?6Ahx~ARBh3mGKbJ>OURCJW9&kvYWPSRo zB~0Nt@1^fuoiFh|(XQPfoYd2^DVXp-ZM>{vV@S+*Wz2G8$G2 zZUy7VM)rSw(_fUf_r~k$F$33zm-_0Fgh~QyRk}Z`G>nl+VL4Ijl`UptmXq*R9WKk! zws6>E*ut^W^E%i<_nyYm>D)X0_$$;@B6b=xR&heaKc<;NglVmWe$lRzy4B(Y->LEW zN)mo7kM7&n3wz3EsPikQSf2l@k?c~2SL+xvMrBh}t^C)k2eWBq-My$8*KDr+I3+vz z(ZPDXO#G{{PblT-3w3^PME7e2%M2*|to1ki{295H%)Xbk{ov8GtY|FeD&Om6KD!6z zOh1-W@Aa;GM${L;_lgvs_xm>EKbu;Ad8bU3zT*;_{HFfLpI2N9VyYKES8Tt-(~Imj zC7pXZ@!xKcaa`K#IE zCyCq_VTxW&y<~!{RE_F;St~zHE4=B%SR}-?CY}+~y5+kwR`JdY>LV+U%jZR!BtA#Y z;u)7=(0j1iKPG`c2dy?cf>r!(xTM9snHb#um_-no9%raktn5?Xm&VOzmhu7;`H$~CSKl5G`rKlq^<$gR)NK$6|I!T{T zAWz_OQ(Di8nr$rQAl9G7Io6(^l{c)wIZvb@@K*$xw8-0<%XSR`Tg~q)rp(ig+1kSI z`nrdv)V*B$m=xX&)s(HHO9Ffi?!Eo0V`fJa&ZmAnk~>N%geV=-Ng&#ZKJI%V^qpJ{ zwLHLz9#Ip!+geu?Gwr-Ro~%RTh#5?a9iCmKUvAFS`T5cR^E;NHcS27Uu6?!`^j)a_ z$v1y-vHN~QReTD++Y^QI?#5DE~S3?cn`6Xus z5177JlHL~_RjgZiCLnA8w=2W$iU%@&4VGT}WOpyUs#*|p!hr6Y$cJEAF85Y!IR@($7Z1{8w-5Jahb|Ef{AU>PHIug>;#P0T%)`T`^oNve zUb}-vY}3CQTOZ7HwK;et1@>sPnjbFKIppppi|mk-59vn#$hSIFZ_X{s>1OCB8$F>? zw*BRP)GWm1vwy=O|8MA=iTL}tk9luDNPKsq_L1U59&`!TiTme3X083D-IIFCReKvQ zcT*4IjT}l&nV$XL?tFUsaSsRKpxzfC7xc}F>kPk6f$HjA(kt$MAzi#UIOib>Q4Ar3 z>v|(r@CfDpeArflB7J+r9rgN@9$&F z1~VRQp3lnyOOY;wZ3y$N$-shyr0KDnGOfsJHoVY;*^#nmD@1W`Vp<-4h*#fvAoB}v z5O?-HA%%{==Q{>=-5o(QT5`p`-!i-j#*b78n71kM?5S@l5(e|_{Bh9SdhQ_JhDJw8 zz2Gs}@HQdrZ8(5#UNhaH1S%uhVjvwrc^Cpje#J;;;RjHBTI$ zV!1@a+Czq7oPDb)10kcmT)DH}i*AT@sm;s0yqglh@9a5jQWrPLKfC2EATrvd?*EcW zX+4$a+RhwFOeSBzm#yusnh~}}9~ho4oQNo8eCh;=gTqRd;?T_o(er^ji8^k-pex4Q zqH_A+zv<@9tobGS2y*gX==t9xmW|70so5{mN$H>F9We*IX;on~Je+^*+fe*4#}sba ztUqO_hi+9$P&TJ3tV#R$L0!+7;>X{$t-OnbupaJurWIOVyK$dK7wYN%r2`x6;?v+YYN(qVK~D z|7t$Ly(Z2vT)h6<`~8lCj@XM6CxP9m%(R>KDdg{$Z&^=^-rTr~w)mtnb>6!t-^D@?wWn@RG5jbE(+H5|HO0JrjK=`elH=*i^H^yR z*r6?z)Ql8m=ZJ{AO`eeNr*|`8?|9pYC*Cydne^8L{5LBfMsF&W<uv zaJ$F`bxNKhnnH)RS1=OnF{|iT(n-}`tKKSq`swfx*EM7}q($Lx+8*z|viPG!pTL$I z-oq<1fs87r54V(!(yIIi=Jx+Mswk0s-rDppA1s&-Ufp^a81VN|n<%v2!s3~_TH)UM zdRuW?Y^tE^6rGn<+h*((thU)F{nN`S;wf#tbo>X`&6AcQv`~Zd*Ab~{ar4A$Vjgu? zdN*wvsIFKU2w!t0^nIxax~V5@CsDhR!PDFBYZ5&560&Y~bj-B<&G#4STcemtdPJpR zWk7P|`IKF!qw?}}rGDe)c6JXf^+2di7_+c!Zc#Ab>D)(J>W){QH80q8G}6ZH>#rsJ zn_^V>9TnR7l_yh4!q4gxYd)?vstclHJTOVJ02nvi6*0eI#{1L0AhZn~YU8o6_&qp2bjKN!V~ zo%$IJuj*M+TpsKNzT`6%!;6*6BL;tyxcy=X31atnIra{&-{6Ngna3G6lTppiD*>XYW zg_SI%)4=`wjQCcK2R_%Bx^h&|SyZxd=o+d!2EC+~^BML}7s%*kxG0|`h9&g6dY7}Z z%S95=xZRS7=Re(*7wV1rx|mEJcjkJKHMu3 zIQ823*47(>PkHRtXYvixI>gEvOWW_HzQWN&x?0H2%^}6{?ahNT$F^Ac>o3e>&`)+1 zi=~Qv)SMEoxbB7r;C&0;8rV)kH@0&lC*gIjrHkwD2-E)_@vhI zj8ukoLG6=pt`s8-BP<$nP{-wkZ9yX@Fly*BJBkAG`wgRf+=+?m#K1tnK_EaNLEwVG z1Az~M00bcjA`rwNNI;N+AOk@Tf&v632r3ZNAZS3)Hg;m@zG)C{Yj}C;5#!*nL$y0} z%;*_8x<@zd&ot&&3_BD`@>f-9`ed{|eRw(}@Z9@lNoUp%M_pgD`?Y7mq3fJ+FSI5Vljkx#k&? zFngf)%ulvubGNy&amu8sznuAyFOH&KuEu?suBGa-QjJ{IfZxR7=4T3BqnU~dUpwYg z2->B4kA9oqx#Rs%SUG-4jXV~W$fexq6@2f0vq-Zvl8BpLn~o30zh;pncJ$X|tj#O( z5%cxXjl>wwKhIgxTdF+n8=jW;+HYjnc+V{0taMp4R7BpNx_$Z8HR}VJ$HB3IU9AIK z?2I@3T}~g2kbal1NT2Z})!4r(_}St1ly`;aS@|Zqf0+HcnB*QFWn zA=lB31K#zQ(z?Oc$`L%x4OzD$#wOLioi=-ncl>8yLOsj7ou2J^ZPGpOZ|usZI~yJu z({{pt#<9lv-#Eqad#7h4t1m^1Yk%WkA?#k<`bi`;8A65LWJSZ>)vvOQx^Id_-g;#0 z9?N^ShVDQ;%zgU7Gnc}sghTNlKkt3x?4Q`a6Pq;Ybw@(M3ZgnT_OmU^(a|VLHklNG zu)Ei3ro0?p9vI$KljAAyji0XynsE82~`=^0^zf}6XYlt z^H#zB^`SdoTZvCqc2|kFMPCNDF!9Dd-csraQP57g|uN%N1LF!uE@Z!)~9dP4k(^GIn1joJjX(?7+%Z?omqd&--aD6 zJlk;Pg>4(pSDDrQn=XU``3l~?y~5}TNBdQBaRx~t{0W=641fCR-=80~gesk}Nd@gq z&h7i7|2`OxSG%mF>|fICr5^m6PwcRICPAzsdtYT{uk!DklgDq`nojnW(EED{!)$X+ zEd#@B>jTi~@)G{LHCb8oL!7}}$m&d4K>>5(ru5@%?@!bmdpVopaQ7gwvVcJTC8~yw&Vaz;N5*6(XK&1J8ZzUm%_*O{KqP2d;@DQZ!&?RT=o^iy~0-7-)3F(l`eb{9|M zdX8^`b-SE*PP}wjz)ISk49~Cl#2n2=O$TA!5@Bv)2F?_3U~o}KiB6_U&WK*uGzrm> zX!LhX`nYxmttY2a!t%>g8Xsi~e#ciyX3UaX=ABFqG>b*~jQUSBDf75fouXw4t;uT} z4i+X#=@;uCrQXuLwA>Z9xJ;P2g2@xs&f!Zp(oD-yO&UobF)gBfBm zj(Sqw$U}(4(QAdP%qGryCU8ZyB>FpZ0NR_;=SX@n6Th5hDq&^5xJ(l>-@a7BN6#5= zM59xDNcD}5s8*(CQP9wb+pq|EP3LknTUcj<)mQ62%FO@~O+ki2mTI0-QFV9K%Ys_M z_|dnL)C!f^DY@yH^`vziMcLCC3>tcE)y%jbv0DXE@lDFt;?~wa+@#jkgYQ%16{F33 z;#cKibJCRELvCB7&1||BQr+&YPvYPG#EVX-Io`DlB9I@PmWg>2FM+P>?v?8r52Yfx z5ivCu#zGadijzz`YHf$pSu6Fvb;3uGig_eo?up)})VF}pDH^k6DoS1^O>ZiPCR9x3 zfoYuY<21*|oA?yQgl6d0(p&}1X#jdyjo|9->QraOeMGg0A6*^%b*Le~>t)sJ;RiGn zR+j3S?G!zP0pc-ki%8cz`$*(xrf9<)b)JxZq%*%GcaNaCD(7QY6a|bz*l0n=CelWs zW|Wc>#$m9d$t4w1tlk~%86Fa47V}M09T~-@=^d_Wp^IEp0R8a^b0$(>L|fk(oDNqd z9^e)X_0bp5R6v$D@k*Et5%@^RaW+4_;zz|X&TE=uGECuN&L~izxM-1DTFcHn@}tq1 z>MGTX%+V_`ViYdyVT!zJ-{>t^ui;PoO;Ru7(@0_{$wu5>Jjx;TWYNV7)5;k8DriXW z=*4TUYr$AcZf;sEV(F3*d5Rvg|0^AvhEGVb?P94xl@d*s;Wu5RB>dQ*fGTv1$}QYX zi$3g5`GQ**Xa4{bJ5 zxTk>aZ?{pwOlTc%H)%hnzjyq-UUroCdiTT9jBJNt5qK@zJ{d1LBdpa z+y)6t?KEqTDR1z6{K@f4RlSMbfOD72W=-=pg-1uAWgU&efUehkG$ltaf58ehMIr$e zrC@ZAb1XHh&(jSZ^(D3fmRf^Paz-nS?~Ey&L}ab;1>%hfx`NOQF?G3fJxXe3a?T8q z)-YRiPtN=CT}C5Yuq-rHmVyD?&HHl4S9{$&@n_o6+wauiWbAaKumH|0HTPj5;gJ+i z*t&EFO{&eVQ&1{6tHkiByT|-ceUf@uGZNHG1zI|&MnxKhRe-Nb_zu6TV# z{df8}foAW=at+6(`s_bV# z08YP@4E-YMjS)Y$5rV^9^(z$whKb;E3pxGSZMEbR;Y+qk{s5W7Q&kPBQGw+NlkXum zan3~SNve;XiBvt|rF1mAW{%z&_r6`vq3G1{BUu^mbo}DTjEv6&XzCdi;=3Zvdd(#i`+KK31_I- z>P{VstB$E?5Mt#Tn7xgckieH;U01$m*N_|PQ*;m@-PPM?*^ZpXHO|#dF(Yd&b}zc zKlt*DEW40(drS0X)V0;Z%a7iYOekxOlk44dy%js0z4UXa_{{IKNJpBvPo`Jn=+Ni2 ztXz@uJGb-@Q#g5hm=*>VOw|<3iL0B}^CYpd!`0z%VFB$BH{_JCyc-y&689v~KryZ_ z&_Fq^EYKjLcIeTydlpk)azwV+I*u)_S!~)Ry$yQzmN6?;{03pJ?D}m8HP0T{vNfFj zJ&~o&Qv62p*+%6r2Y>0Whsv2uHR6GPQZ-(eD114{Q{-TMyhv>GzL9R6M{dXWW;JUY zV#jmZ%Hps?>*b`Yoy@BR$vd5=(vDZd*IVvJD+Oc~8gus#d!M{$jrxu}>oHko_S=}$ zvScA%?Da9w3c_5LLU#I+a-AuKZ=HOuLY+YpIS5)v!3sszD0M>DN>9i;3?Xe{I5?q= zrkqH27{ow_qCod0esVpIvb#)?!~ZqnnH90Ph4+B?_IXfdai+KzuTwOQz>5c zfNNT?L_j)38yn(1erKLqiMEg#u+=-sp0SWPomnv^p9L?SQs zjqf(_;v_ETzBGvR@6T&>K6igFr7 z5|`ep&Nw-gO>5okB3Mm4&GE*c`+_4$6k0bF(9%CTzw9rs9ryevr;(mPU+SkgvO1|? z_YRhW?TDc4c@-`Wi2`%=$6J%HscS@ccZ(d}ri{FzZG4PErQu?KT83CyP*-76kS_~L z4>k?8vY=F8@1YYGlrlW%4rH21$B}Kn9PchRt9X|DC{egoI7G<>+S|v5qGA3&U&a3K!xi{1Bm$xwLI^?J z>|lT-3>b_a@?r-AkG(n{j2gn6C#;&Fg?3z8XpbEw3JZZaI8fK&+YA3@PUZml*J}{R zDLxG}!2xDg*oGt=VKgb;+qe)rCm70k2O2TO6;7$y!H3YCD1JB@J!HyHjDuJ%LA6f{~l|R=LKW3 zf51-g=o|!o!WugOKxB_%jcj}49!XzXFOmVdrCLe&nXXgST zlpTx@IuioQnx%hAdgz8Q7>nq~g)&bVC`F)QVU!)hgB$_Dgh8wF$Pu`ZjtJ-`#0nLN zf)z%IfZ=yJ5$7AHfricz4L1U8TnMt~Mi4+R1W{y=swj#Pp=)?C$Q@BIvKW*v3MPMY z?ZWv7kO<6mtkYTyl+xDmw-4x`N;^VJsEKcdMb|MNBnKP zunmG7{9X^%MkxX21U;2NX(4t8v9l-*f%UaY01w0Ah37YrArLr7Y`s+^fyoZ?mIS5{ zTqIP0i@XG_NdiNcFcMo3{!74cU*^K#b&f{lk=SC?oui)$$bZG4kOIBA4yj3jO^U}0|{ z6&aKr+~_lOM;dT10f!Kr`=_Udj?Pi|(uH107NF8^V9m$4LQs}0sO~l~F61K(S~?GM zuq=o|4y6hI$pFnOplBfvIiN=|;bQf@azOt?{X$Q68I+aV0HTxwlbWA{C=;wJ697c5 z>4odBDJ}tYdKnbUEa1YbC=b+n;E8l@4Fv$)thMr>xZO`KOxy}!s+3n3`r8UXf8z~S zUkw1P9hy@B`t|o0dNW0!f4q93&rk$<^F6G7_8c@EVwc9H1eP{`^v`t(idI7L!{ne^ zC9q{zJ}6WTlz~VYjMOKDhb^$FGMH>13RMQJh=b;ofl$UCE0j|K!gA*eAzB3p$DnEz za7w~6@USK2R0UH@mSFX+szCp|>_T4&QizY`c+hS+-X-keU{?c&qkI+*f>q*ELndlq zKwBt84Rrs*79M1(1!^?|NW}3rkev5VP92Om$cg{Ykj{mV3*r5OQ9#?8C`K3>s!|7w z-M<8xXn{r&Y5*gPG(Pq@>Z$>ZC%3RhNZbuL4>iCSVgH;h&=(DqCODTInxMiqK^LA> zP2icw{PWO5bDH25Erf`)fRYX})&fe^xBrxvpnfgT>#w^PqZ4R@eZU|&ZLkkNI01Ga zDS$-efm8SIvA&}Xjsyzg&;f&KL9XC}Xwtb*w(9`<611xW8i0X}b%BHyN(C20TI_{n zTNg;)LTq}V^w*mSu;oi^CcuRtJ#bj6I|-nVodopImvbc6cj02u2QC}PP#>iZLqLh( zf2~1656Jwq=Q7SfW6W~Hdlc1C6sf1k%H#H1-=bI?FJ|YNYMZ# z1(Se$3{Xa}d(b;@fj4GjQ#;voM36ikXp4p+iV^-h2TKPSqNL!;xmeJ14np&=pg9j1 z*p0xGwKE^f{LKf9_c?=Kh-Fj@0n>KQ=oeubgfVzCkWh>T<^UkZO6aiFWq(db0JRx| z7dFdLY(8O>ju;{_0ru=MEMsZ{?DL}>SmyLAV7{C)MDtjN!yFh) z7O>#S0!TkJ2kG=hEHk_an89=A%MzBMyb27Q-?8A@caZkH3es-NSf=(oUA2M*Fbe>F z{x}DWkmxF?=5-68m0!a$g%+S8A?sMsybjVQ=jpBuEOWL27z0bd5N%gt9^@!^j{@E0iky^aRSV0(Z7HG;0Ok`87i<)+j~f z4^k8kL_vmPg&tUgJ8%nnZjDkw1W==(JZf;H|5~FcSpNT8bnpZE|D9oy1_doZc$|=d o4S1}$qfn58Fp>j`IY&&4CviJ^@MdNaVc_84U|@6D$TN|ViOpg2d`1m0eUd2|OzW}ag6X-esbHFgy%9{e zb8P1Vsdo^LX9d!W7fLXJxQnH delta 177 zcmeBm>viJ^@MdNaVc_84VCb~l$TN|Vsnc%rd`1m0eUd2|OzW}ag6X-esbHFgy%9{e zb8P1Vsdo^LX9d!W7fLXJxQnH> source1 = getChartData(file.getAbsolutePath(), firstChartNumber, 6,20);//2017年开始 - - if (cityName.contains("丽江")) { - System.out.println("丽江"); - System.out.println(source1); - } + int chartNumber = 1; + List> source = getChartData(file.getAbsolutePath(), chartNumber, 6, 20);//2017年开始 //é历source1 - for (List r : source1) { + for (List r : source) { Row outRow = outSheet.createRow(++rowIndex); // å¯¼å‡ºæ•°æ® //上级行政区划,行政区划,年份,总人å£å˜åŒ–,总人å£é¢„测 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java index b914cf39..7edb9bd7 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java @@ -347,8 +347,7 @@ public class ExcelKit { * @throws InterruptedException */ public static void callPythonRead() throws IOException, InterruptedException { - - ExcelKit.delExcel(excelPath); + delExcel(excelPath); // 创建ProcessBuilder对象,并设置Python脚本的路径 ProcessBuilder processBuilder = new ProcessBuilder(python, py); // é‡å®šå‘错误æµåˆ°æ ‡å‡†è¾“出,这样å¯ä»¥åœ¨Java中æ•获所有的输出