From b640887303f76c62efb14f1c194c32e076f72901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 12 Nov 2024 16:00:16 +0800 Subject: [PATCH] 'commit' --- ...ŸŽé•‡&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ.xlsx | Bin 9181 -> 9181 bytes ...人å£å˜åŒ–åŠé¢„测-åŒã€æˆæžœã€‘.xlsx | Bin 6474 -> 11851 bytes .../dsideal/base/Tools/FillData/City/C10.java | 46 +++++++++--------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Doc/待处ç†/市/ã€10】城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ/城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ.xlsx b/Doc/待处ç†/市/ã€10】城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ/城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ.xlsx index 1e25d6cc4e716d41cf726d43cc1b1e8a445863d4..25bc46aa82f498958c686e0c18eae5115747462c 100644 GIT binary patch delta 177 zcmccXe%GBRz?+#xgn@&DgQ2#5BhN%errP?=^BFb3^hu^H~!1S%LK8jS@^C?q(@1u(JEo#vtLzB8v7PDpb)NMD;1!fT%NywjhdI2`uNM bH~!1S%LK8jS@^C?q(@1u(JEo#vtLzB8v7PDpb)NMD;1!fT%NywjhdI2`uNM bA|fIf4zi5I8wVE$`Sv9a1N0h` zjoS^qxZ!aDqlhNqOF`ybv-K&tDjCUTyw# z-a>THyM%BvLU#MxK>hOg@#IsPDN|)xTFGUW&3? zE9P;yV#K!oxU-W-M}v@PDcQz`00#yu1;78DyO?Tx9w2et!AzAps5`ovuw%ilyL&?H znNh?uWE1sA0_A*b{z3OI3#_CX7z$cNO=59tje8O~p#~v}emeS+Y?3p_BeKf^>k-cs zk7Y$~YP8r|mE4tEtNoVfcsw|1*HE^((zy~=G@hbSSVmlUHR*yha+H5btSBMqCIZ>@{MN{3soF( zcxY?k>o~JGvKC3klIr9Act0UwE2Yuv^utc&hwz&sy@y z&hOr-DWCNbpQn!XTPIcByOF7tagJ#XzR}xDfmQLRCygq7s^&mV-RUo~n}p$*_9@5KY^eD&8e~F@4G4o`GpHA-ydYL+^(@hmz9(j z9LKDs0X59OcS{o$%PXbb>gf*qsJ}CJmxO0rMmuVctBq7?_Pwv8+mB^tE_TwX`QTQ ztSpVvFmQQ%qOwu2oKXL?b+0zdSaS%c@DcHkccZb4>`ig*qmREk9HR8vsrwviHRa0D z%nJ0*s;onSE;3HUuwOyKeBY;gI}W$9RFM>Mu7EGT`c zi!2V%DsnCO+$Q41IHj*UvD*A`<3F+o$V^M+Q}7$Q0Nlfg zhxY9$gx+5_Gkk5AYk%a;Um)l2T^?!=xZm&%mO<}=FaG)^&BMg|hM9pYi5HOb1~|bM z?c?`lV=?Bexv+#d%z`cI0=xeGlf%Xtx$(pX;NaEt{q42zcHNis8>PX)1?PCCxo^}s zPd{GxaNGPk&?GG{EIBgGV-NxFeQ$f)6&HVhK(n4t?e!6U4n2OzFw5M_b#U?2l(= zf71dTt&{TE7Y&kbf4-(X#sCwZL#X=feCuEC7n~?Hd+;*G3?E57yfs_CCciHvV z=?n6YBko%Y1Z=+UVzd^CS^APx^dw8=@ozE5}o!e%qzPX*PvyQo~kfmEO9d%Eh1SEY0UC2?Xj`c^d5Z!4h& zJhE`$G25#*ebv6KQak3pQ$?G(TNS7@Th~h|G-*(T|5Sd>zHS+_eOcw>4`qoc&JSaH zI6W~p{fT)NCArS0-0W4{s+~C{nys$$u=QGFTAngwdL~J4DD*xL@s;xi+DJp_ZjUD8 zv@hVYx@0nVzN`09_CA6?mgW)rK*S67+!lPM$5cI@7ADj#sVWjYL{Zl+oOaI`u{v@q#_ZH^s&z@m!UI;SOyEZKR>WKjUwSb7K05#ucd)jneMC zP`nm1nSMQt-K3;Q@r4gPfqd`kC5ktKYsWLdb|)EIc;@FmJYf#i))4QZHV@L4dhUNp=*SaS2o=$52CH|pgr zF81r)0xzgY>O?=#+!~;is16!LX0dstBDJz-VxwJ*#ZMG|fg&2L+Z4!Z!ObPNF>pEyO-o5)XD?O8ZG1m?VWNX#R# zFKld5PiTaX@NOdc<-C2oPkp^DDV3$REoYbEq$l&y&4aSSU&9Lpe4INh^8BNvd&PCT zlkji4Dr#qQU|dV>%Vp2s3UEgv{1f_blNu09e0P4{mchfcOjMd^>^3bu;QzC5-Cqkp zP`{12OT+H%%;mOo0(YL*9I7%LDt5GWk-z5e`&Ms+QY62|{d@aG_OaH?ySq9x+ww{I zp(A>eY56)xxAkk0_Onqh3`!INk6pnPJtI#4>&4~Uy zLsBVE!&1jlsZ@lY$Fml#qfsu5B$b)~?1oqD`aPRRxce~gGon~nb>-4ONPpyHnKWhZ zv^Rb}YE$@V!+@|Zdg4{LvVamCw{WJBu%lIbUT&@X)Vp}`Ku#pyRoIna7@7NA&Sla1 zU7YAicE&=xp#EwRWpavfGm$!XXC01xx$q^M64Cksy35DUt=wOo*VKuuC{fty0>tQ| z6D12ZznL$fS((!X9yU-!(QuHvuRLT_qa@`ruEH@7+fE&mCQ2`P8OccZQ+*gl<`|df z@WS;H4m$YB56X=xw)5Hwpadl{jj?WgTdYw5^Z4@xbzD&*w<>}vqf%z zB4y3`}tbLI&gpe*MqEr16!rOmc)Vp->1(TCn~!c^LNNOLN1g)o=tN^)GDP< z`sjRlACfqWC#o9Wu1FmvbaDiw$(bIzdwU*vp3cp=9ay{gx*crJpRBeDt(lvhu9kE( zFczO4EvKC>HCG)5n={KLYb_M!Iqq%lZ5{xP`$s$4l9G{*vdOZOH&0wocedx28tQ6+ zJs%IhgUzYq&Y7X${_#(8=*?$4VZ{rqAvckS3clk*uw4p2p&L(-%1X zb$S2yTx<7M8kv!!_S!GMW7m_CL&sD1gT0f+{kfgeY=_nDp9D8#=dmoz?ab^9&P<;Et};rZ zm29|qEaiBTv1eqMt7o^c_Yls38Lhn-d=RDMH{;d~nSoZApn9T8fcf-m0(F)mM z6^UH^BNjhjL&nb~C7~93JBHB#9b#$$oy2MZ-Cl9d4?gYLeHyNmr|!iy%wCtc*%@mUkxB+JwNl6HG~<-dBhKrr#}523A6`>@C=p7 z45FtWD{v_t@x!>hVX>@j5ZAq%`DYDC^iB_D(+Xw{*~&mP;iW&0UI+$84x7lqi=MS!sAMW#d;nroVUia^+``qW z2#|7mcxS;RQTIjjfTR+aO_0s3C{Ci&(?Yj{XRej1ZPrWF!C{nn<1 zj!{0#3dREucI(Qa=Tgq~3&jsf#7Xp=f_2h8*6hL17rdUX1KxMN7thLW8;Fcy)fF=k z%XtEq6Y6TB&!qR&;_ez2&T48O=#Ilen!PB$r^z92!>zWjzm^KG?KIeYv`ly_3NrK? z!~&8-TwY?a)*yPWC%Jxo;CUH|tK5mbk!Ud|%dSNiQKujfa?16a#X|NZCP2Eb7?Oin z6gutQ19(Vke%ehi0*uwwjKVa5$J0Nvu#Wh5(jjn}4$f0?K0Np2UAfkvc7oUw_oQFH1`lNNZ?6Xh-Y=THN9rAip7_vD@=gn5_Ad%34&3798nQF z09n3`D71Vq;D<{9c{$FO*bCZpis(hj^7NNfTEEhzSnSbG2P213Qu00-AQ@b2ZBk3$ z-VzrqQc_P>lJgHx?u6Z{s|bL1!nEot82--@WJtno=rr&pFeaqGrXn6+dYh70J))On z@Jk%^w_9`MQDqbA0OQ7I^9@D>jOhR;mUEimx#E5-W?ooX4D~{L8r4ezEV=OFxGoav zpkLBox-h4onW*F=3}+On>U`&T#C=bu^UvDv#15;3Nz2#6G%0adE<-cH%jpZ2+h;TYT09lQfZ~d3m z&6Dsld_dy+YBI3d^3dGzE2b_m7ztDARP^8}e_XuMgZIP|>la5V+#{GY`xU zQ|V9MPaSv8adpD2bS;>u6vC}t`L4SzFX*6^Z^(1l0_o&8)ZT_{VQ|`sY;I-it7q!V zg#c*fpU9k6x_bF6ccc~NV?DfB@_|=~JhV!l9}QQ?Fiu#c(=iw!q4l(Z4N}zRo{)IF zxb#jxuX+<{Pm}lshRQ&3Cq4;zdWrCS*8;P3@riZuO&r!hN5R7D zwrn`{2EG{BDC-SWw(# zaQ!f94wE1T)AX72fKn39L!{r9qc4{bfPbVDJ@$!>_W&nx@7%^iq-X#G8FL=Rtvo+r zg7bSgZQ>J6Sg<;vf-W7E-eP-m6n(4e*zy9!4xX|zz!IGP0}Sq2Zy1yo8KaT-CpD|8 z`cX(0KJ?}5_$qSpl#>-^Bs$!k!>_cfxRM+WN2oY|1c%OQkt+0(^)w|E(_&KwV#yAN zQ)k%iGt8*uA1uY;a0$c+WgbWFIunKZA-U^)KY;!K>EC?r*{g{DX4mbblr!LzbU6c& z5C~zLOYhRO!34l~=Jn6K`GoamAW>UGcKr9&6}69KKfdgI`;wO(@(IAIWxry!-(D^a z%nU5T#4+3lk*Gee&ymKCkw}a8saajnkILR--xGK_>#UIs?0rd8-s}#P-*~+vz38lO z5t3KyCqoeOT_JPNNkPZQMw5MHTrGWX*qh09N%af_vkHP4Wz*l7re89phwLJ}m|U$@ z)j_5-!TDhbWYhHN@Z*l&Q%J9#afFzEz`YFi@$)3LxSW0~(cVIKJi)VOtyMn? z!@`OlRK!)0Q+pdmwm_l-*O{3bt8eP}l}m-39qfPAO2p}>^EG@3s{&8yDxrPX$?iN> z9JwF8eqSx{DL`!j32`)#emwghm~SrCV@r)uyG?u^WNxEMr0Kvjzggw^w&flA$wGQA z%yX)YlAk7I+M+5EI>*a_aq=BW@Tpk?tBPd#7_uJ=Vo#<;N3o4isBnnZ-aYoYK(P)E zOm7V+J%`mb4p5VL`I3KgcEJz;LmaR zQH`^o(7%ZcSnK~A;!oi&KlX4t0uF4MY3-O?y{PVlg42y* z>BYWC3T?7uPtcV{DS}Y(ayFFmG@(B*y?pS$7*VKvIS&^5KS)WX+(eCaga*#O5h(8@ zYf11v1?mpERt0iiGY55!8;#gP7>+5Od2)X5K{AmF>qa1{KzP+5Hea;>@5Xjd zBvc2K5|9Db2nqikOb^Y5)su{-ekE-Egu7m_NA2M-jIdil*#Z~WWq!RGVLhJI0JV6i zJV^MlaJ;sHm>qtfQ7y?HhnW=eT+Ls-@mkw25gAYPpx|NizcR)eUm zOfYny=kD(2TH}{IBAeNre{4Qrqz7|`7mPo)YaIkBFY&H$3rC2(k#C*a2HszM9XxHxZ{~$vF-Ar2Uh0c}syoJ|bE% z52G3L$@tb^=r|XgNb~K98r0Jfu0RlJyrS+Hzhuk>AGTP=(uRl&^#-ax9S=UmiO+@= zY+HI=YOADcjY)AM<>M%*tP->@=>IL*;&hnKW)7fca@FwbKYErob}2lfs{H*WThnd* zq(#b$1>`zyQiXh^r4yp5$N5K%e>=)1<$ZmA z#LOh!!UhC(Wq}~>O!G;6v%({|M0{3%uJmibg0Yi~VY6B4RjBe0Viawm2@OCPM?Yxe zIBXES?TFGpP*AF;<1vUP^6}qzSlBV0E}C_3XsJe|Js*|X#k)gbP>!$8zVo7`pMnk# zAd~}Em2i!HLnI%W%o_UvRk{P^*Xlm3ao8uXz7p3 z&JAemo>C3tZs^OwpQ9h0%ers#AeLY3O%@O!WH{!Qh{1$j@X0vVohHu6?(SYpymyJZ zHpH2b+9!XySRbKMWblKyN&A=)hwqnO5_wMjCBEWc?m8I+Z$oS0a@5uzY4xnBxnE8@ zRK7M?CeF0<@?gR;bq!S*HeVP_6Tf`Oo2pJwe+e-^?q;x_1F~$Xt-sJ3E{OuU{U$GF zR)0^2QF@RMdR}ESJT`3OEoHyBpUG$1;);0lR3^X7S%+S?sM9pRpd0~DfQWY{;vU_~ z>%Pz$BVdLV2JPL-dt6!HLLt4m()Z`T`@CUUm=FlcqV71ZAfV7v+$1{4$A8YW%}uL= zI)cZzp3%U{pwR0buv~+HkNmM|^0?w|r&OxlvGd=g!Z-ebsEj+M%zQGeoIq!S=j)8; zOtbL9{+zd1o#<3oy=o5?qsXhurV#;Wq5;#Qvm~0U>mf1Y>2x@X71Nf3Au0}K#oret zR9bhn;}sm(8br-B+dmD1eC@0?RJ|>VC|6UehpBHC>jpr~8)JW&32~@;h$)X=spxBb3KNK>0|GUTAYLT!`!-AKZuZE*@b6St$b9JS=?6#XRDK@^J8+s1syi7PAWZ#}Ne zvG?*C7eO`Naxnm-c>Nc#UVxBd2wBPZ9qa+(P@#fn)p*~PzXX9LSkOMdpx`RKsVSJ# z`(8%QDf&YynYsrZ5au#bv{~Fc0&1He-h*rCdZj5R!_2$4*g>-}&bP)e4zUb!I$mk{ z(uTBDAKU%Yr0`%`tb7Me7Wmf!o}hXGuRoe8*aWpr`$seS3o4l+zm$xj(`+Y-_&%U} zm!RX+&>kuGgebzDSib)i#cCYNLFkVt^w<8ER*&x8z|x#k+->UB#3Mx4q*ctZIvX?+ zt*KWNYXMC4s%Ob4hK#Dty%Upd@!Y-iHGB)Us z+8E;Qi$&0Oe8V;lC@HsKt}GcS82&Xxu~@+;D@LKrGt9VP`H}`agzjt858)*}NlreZc z9@PiAfgKk&f@YSA`SZL`(0p2E)`0Ir&a<`wZr_(!8aG^x;``-;F!RN43Ih4*xh%8k zXH;k74ZJ58x1%;ZH}}3+vs)OfZ0HWE#G^z-L8Dy{EVWqZBY7etli{N9N@f?T`i#VVM$(K&IsYZeosojhNKC+^Hr^|LS+P@|Wgl#@4Y5;GP{>dJ=nh)K7D)qM9%0Dw{~v3C2BRofG>Ge4|c<3I`7?ce*;eTYtU zuMPaH`@*|GM`GrQprHev<_ua)Injt+V-!3)Bod5a{iF;+tV9mXlq zR;XwB4(eP9)|_pC#j~uhc5J;=lA?2@e8W)xY@@_2!(8a-U*=ZF*x+h)N+?6{qE%Xc#Xu($CQhBIF;XH8i>>+TQnv<7=&kfYfvAObD+*Ns9kbk0V1! z?r%R*mV$qqz7DIbGT}L;FTb*Kc?Xp#&^s} z@0HLR78wbNZ)T(Sud82Zb(#<1;6A7vdWKn~Jov{^V$8HJ2k0rQI!`RLN65%B6gX6V zTD%Ra1=mY*LJ|!vwAqyH&=g{3xoBAR{l045Tt75!_zdK&u0^ z41X~2BKjvY1+(?h&+aV-P~X#uwL&Td((N$A>hkf3TlNCgM?QLpi6dC-5e ztzO&@xBrfsX?q7&f_(6MyoAA=O`vWuwqw0h+&2Zoc}B|_4Y+j+AA0>wnSNd07#dO1 zrwoKTibWw(uZi;2clIa{7#CF78i1Lx^WV--V^?ghqQ3+-85T1=&@%*OQ^^2cLwq7J z+T@u{w0ZZ!bvNwRpj9acT$Mo05NB)eGqUleu7>mOywLeSEcp(%b%M^J=R3*#kKnym zQ5$gqs5h`4!a#+}1;2^R#c$cL? z#_ZS!kevklyguwN9Wv*7?Cvh~H}00CMzLslfS=;nbM^K($*8IK-UHu6S%aQDZrz=b z3Ex;fnMz=psXG9mH?5X2imo)u3@}*A2K25K4lWh!??;Ye@Mz_r&loAwNGK>3}#0j!$8k>?)O#bxBmff)fdG8 delta 4129 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 aaR^8?|Bt`Szdn2|M3U3j=2?;A%>EzkVq}~E diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java index 477f39f4..95e55b22 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java @@ -73,18 +73,17 @@ public class C10 { //排åºåŽçš„图表 List charts = ExcelKit.getSortListForXWPFChart(doc.getCharts()); - //æ•°æ®åœ¨å›¾è¡¨2 - int firstChartNumber = 1, secondChartNumber = 3; + //æ•°æ®åœ¨å›¾è¡¨2,图3 + int firstChartNumber = 2, secondChartNumber = 3; - XSSFWorkbook workbook = charts.get(firstChartNumber).getWorkbook(); + XSSFWorkbook workbook = charts.get(firstChartNumber - 1).getWorkbook(); List> source1 = ExcelKit.readSheet(workbook, 6);//从2017年开始 - workbook = charts.get(secondChartNumber).getWorkbook(); + workbook = charts.get(secondChartNumber - 1).getWorkbook(); List> source3 = ExcelKit.readSheet(workbook, 2);//从2023年开始 //é历source1 for (List r : source1) { - Row outRow = outSheet.createRow(++rowIndex); // å¯¼å‡ºæ•°æ® //上级行政区划，行政区划，年份，城镇人å£å˜åŒ–，城镇人å£é¢„测,乡æ‘人å£å˜åŒ–，乡æ‘人å£é¢„测 int year = Integer.parseInt(r.getFirst()); @@ -92,28 +91,29 @@ public class C10 { double cvalue = Double.parseDouble(r.get(1)); //ä¹¡æ‘ double xvalue = Double.parseDouble(r.get(2)); - - if (year <= 2023) { + if (year < 2023) { + Row outRow = outSheet.createRow(++rowIndex); ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云å—çœ", cityName, r.getFirst(), String.format("%.2f", cvalue), "", String.format("%.2f", xvalue), "")), dataStyle); } } + //é历source3 -// for (List r : source3) { -// Row outRow = outSheet.createRow(++rowIndex); -// // å¯¼å‡ºæ•°æ® -// //上级行政区划，行政区划，年份，城镇人å£å˜åŒ–，城镇人å£é¢„测,乡æ‘人å£å˜åŒ–，乡æ‘人å£é¢„测 -// int year = Integer.parseInt(r.getFirst()); -// //城镇 -// double cvalue = 0; -// if (!StrKit.isBlank(r.get(1))) cvalue = Double.parseDouble(r.get(1)); -// //ä¹¡æ‘ -// double xvalue = 0; -// if (!StrKit.isBlank(r.get(2))) xvalue = Double.parseDouble(r.get(2)); -// -// if (year > 2023) { -// ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云å—çœ", cityName, r.getFirst(), "", String.format("%.2f", cvalue), "", String.format("%.2f", xvalue))), dataStyle); -// } -// } + for (List r : source3) { + // å¯¼å‡ºæ•°æ® + //上级行政区划，行政区划，年份，城镇人å£å˜åŒ–，城镇人å£é¢„测,乡æ‘人å£å˜åŒ–，乡æ‘人å£é¢„测 + int year = Integer.parseInt(r.getFirst()); + //城镇 + double cvalue = 0; + if (!StrKit.isBlank(r.get(1))) cvalue = Double.parseDouble(r.get(1)); + //ä¹¡æ‘ + double xvalue = 0; + if (!StrKit.isBlank(r.get(2))) xvalue = Double.parseDouble(r.get(2)); + + if (year >= 2023) { + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云å—çœ", cityName, r.getFirst(), "", String.format("%.2f", cvalue), "", String.format("%.2f", xvalue))), dataStyle); + } + } } } }