From 1c87f83c319e965d86a939051636a8353153b8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 20 Nov 2024 08:45:20 +0800 Subject: [PATCH] 'commit' --- .../新-教育资源配置发展预测.xlsx | Bin 11431 -> 11431 bytes ...资源配置发展预测【成果】.xlsx | Bin 3816 -> 6149 bytes .../dsideal/base/Tools/FillData/Area/A12.java | 145 +++++++++--------- 3 files changed, 73 insertions(+), 72 deletions(-) diff --git a/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx b/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx index acb1e19f81a762c2f53616b3f7c3cc74ab5a0cae..e5b40c013ec06ebb3f8f30d77ae9d020e4947a6b 100644 GIT binary patch delta 200 zcmZ1;xjd3Lz?+#xgn@&DgJHI7$wuCZjLblK^Fl^V2;(eM5`1$dL ed2wxfh`hE1n4Y2y5x=T!1?CIsxPs{@9bW*c57JnU>t zV8x=Gf4IO55s^4nFr!rRKSWKrG}N5MGM2m`smb>>?ZC8xmKm6i)UpQC)3t2C^ffJr eytuYKL|)qhOi$5?9?;=etU0Gx$d>Rk#m}G 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 ZzEmny6oE!@K$vxI@M{3dQ3RP!{{d=d73u&0 delta 1463 zcmZoQcp=Lh;LXe;!ob17!N6Hsypgw(kr_yD?qrk(GbS%*ItLP%T*0hTAM1VCK&0)z z*NNKMOQe(AwmDB}Twt+bQHA)VaNCpnhn{hpSb(NxObcvrxS6!d<^)L5Z`8%R(2C6rr>{!$+HgPP)Fl_t$`Xii$x4 zn=o^trLuhv%lgCnnTt0~IDSF@ibdbg9kX_B5mY{3zMcQ`r^x(e`@Ij8R)!V7baV;O z;H>_Z zatd3Lr41&}n%NcYs5os()0TvZN?K8_Ub_RXQeZOb^K0V>c zq0X`y)@^KIr7DH5E9aed47uX1rR9C+-@SLY#KI?phr9H6u3K?kV4_9hnjvP5gYUu0yju!faXK478h$4rt|p>zJY@3 z-4Rn=l`i*(KQGo{QtD1H>si;BOHzL2r{A0IJNtVBpHBK6PsOJPhOKT zW6rBOC(!qthb1`0*~OZMo? z7e&6BaoXs*VDZQER)=!itd{AApDtB7oD=I3)21gjYfbEt*gtnq7ah6KWW1`nO#kP0 zhJ*5I|AEoK&QV&s@Lma{FayI!7PNTTT*LVtlCsOVMInqn9w|r?U(KsopL^w`-(dp* zwg=Wi?-PFd-4#2vOl5^m>izP(Jflb#A@^;!KmD-KWX(B$_Ho^0i~X-S`Sz`vbjER& z(-lS8FTbWZ$aXJTv3Y`>y{}o>OUEty#B^HzgjhDHEn66-cy?>vH_6~aKGAU7iw?PU zo~>(km@PdsBTMDOlI&GpW^cZ4k33r6JOG_3#Kys|T<{Y;u-F0)pgDL?Y|(409ED>VX7->tmD zf2016jQT&p_I(mJ9-R<(j+XhIbXiP&-;GU2kBBQr&-s;fTP%Iwjg3cl>X+pfKJ2!Q zj#28gTo|W##Ph3^qTd>Gj>4k7t{uW}WS!=uycc}r^1DGm{kD6H#X~!wlJAl~w_Cp4 zrvPM$D*Elp=P0~X>)tW>9lO(oIArYfpq^6hA&2 z@$zkthG**qh1*$^C*9%MaDP!tNO_mg&N+N{qq?6h-!AL8zu4#(8z|z>&-cE)1DF@1 zSwZp6$Rxr5FVZIO7qtVGV3Wkmzy+D5m^BBG8wtw7lWWAx`9K^|V4 raapiC3dE(EDmW+iifbr> source1 = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0); //需要处理下人与万人的单位兼容 -// for (int i = 0; i < source1.size(); i++) { -// List row = source1.get(i); -// for (int j = 1; j <= 4; j++) { -// if (j + 1 > row.size()) continue; -// if (Double.parseDouble(row.get(j)) < 10) { -// row.set(j, String.valueOf((int) Double.parseDouble(row.get(j)) * 10000)); -// } -// } -// } - ExcelKit.printTable(source1); -// chartNumber = 37; -// List> source37 = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0); -// ExcelKit.printTable(source37); -// -// if (source36 != null) { -// for (int i = 0; i < source36.size(); i++) { -// List row36 = source36.get(i); -// if (source37 != null && i + 1 > source37.size()) continue; -// List row37 = null; -// if (source37 != null) { -// row37 = source37.get(i); -// } -// Row outRow = outSheet.createRow(++rowIndex); -// String year = row36.getFirst();//年份 -// //学前 -// String xq_jzg = row36.get(1);//教职工数 -// String xq_jzg2022 = source36.getFirst().get(1);//教职工2022基数 -// String xq_szqk = String.valueOf((int)(Double.parseDouble(xq_jzg2022) - Double.parseDouble(xq_jzg)));//缺口、富裕 -// String xq_ysmj = null;//园舍面积 -// if (row37 != null) { -// xq_ysmj = row37.get(1); -// } -// String xq_ysmj2022 = null;//园舍面积2022基数 -// if (source37 != null) { -// xq_ysmj2022 = source37.getFirst().get(1); -// } -// String xq_ysmjqk = String.format("%.2f", Double.parseDouble(xq_ysmj2022) - Double.parseDouble(xq_ysmj)); -// -// //小学 -// String xx_jzg = row36.get(2);//教职工数 -// String xx_jzg2022 = source36.getFirst().get(2);//教职工2022基数 -// String xx_szqk = String.valueOf((int)(Double.parseDouble(xx_jzg2022) - Double.parseDouble(xx_jzg)));//缺口、富裕 -// if(2+1>row37.size()) continue; -// String xx_ysmj = row37.get(2);//园舍面积 -// String xx_ysmj2022 = source37.getFirst().get(2);//园舍面积2022基数 -// String xx_ysmjqk = String.format("%.2f", Double.parseDouble(xx_ysmj2022) - Double.parseDouble(xx_ysmj)); -// -// //初中 -// String cz_jzg = row36.get(3);//教职工数 -// String cz_jzg2022 = source36.getFirst().get(3);//教职工2022基数 -// String cz_szqk = String.valueOf((int)(Double.parseDouble(cz_jzg2022) - Double.parseDouble(cz_jzg)));//缺口、富裕 -// String cz_ysmj = row37.get(3);//园舍面积 -// String cz_ysmj2022 = source37.getFirst().get(3);//园舍面积2022基数 -// String cz_ysmjqk = String.format("%.2f", Double.parseDouble(cz_ysmj2022) - Double.parseDouble(cz_ysmj)); -// -// //高中 -// String gz_jzg = row36.get(4);//教职工数 -// String gz_jzg2022 = source36.getFirst().get(4);//教职工2022基数 -// String gz_szqk = String.valueOf((int)(Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕 -// String gz_ysmj = row37.get(4);//园舍面积 -// String gz_ysmj2022 = source37.getFirst().get(4);//园舍面积2022基数 -// String gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj)); -// -// ExcelKit.putData(outRow, Arrays.asList(year, areaName, -// xq_jzg, xq_jzg2022, xq_szqk, xq_ysmj, xq_ysmj2022, xq_ysmjqk, // 学前 -// xx_jzg, xx_jzg2022, xx_szqk, xx_ysmj, xx_ysmj2022, xx_ysmjqk, // 小学 -// cz_jzg, cz_jzg2022, cz_szqk, cz_ysmj, cz_ysmj2022, cz_ysmjqk, // 初中 -// gz_jzg, gz_jzg2022, gz_szqk, gz_ysmj, gz_ysmj2022, gz_ysmjqk, // 高中 -// cityName), dataStyle); -// } -// } + if (source1 != null) { + for (List row : source1) { + for (int j = 1; j <= 4; j++) { + if (j + 1 > row.size()) continue; + if (Double.parseDouble(row.get(j)) < 10) { + row.set(j, String.valueOf((int) Double.parseDouble(row.get(j)) * 10000)); + } + } + } + } + chartNumber = 37; + List> source2 = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0); + + if (source1 != null) { + for (int i = 0; i < source1.size(); i++) { + List row36 = source1.get(i); + //if (source2 != null && i + 1 > source2.size()) continue; + List row37 = null; + if (source2 != null) { + row37 = source2.get(i); + } + Row outRow = outSheet.createRow(++rowIndex); + String year = row36.getFirst();//年份 + //学前 + String xq_jzg = row36.get(1).split("\\.")[0];//教职工数 + String xq_jzg2022 = source1.getFirst().get(1).split("\\.")[0];//教职工2022基数 + String xq_szqk = String.valueOf((int) (Double.parseDouble(xq_jzg2022) - Double.parseDouble(xq_jzg)));//缺口、富裕 + String xq_ysmj = null;//园舍面积 + if (row37 != null) { + xq_ysmj = row37.get(1); + } + String xq_ysmj2022 = null;//园舍面积2022基数 + if (source2 != null) { + xq_ysmj2022 = source2.getFirst().get(1); + } + String xq_ysmjqk = String.format("%.2f", Double.parseDouble(xq_ysmj2022) - Double.parseDouble(xq_ysmj)); + + //小学 + String xx_jzg = row36.get(2).split("\\.")[0];//教职工数 + String xx_jzg2022 = source1.getFirst().get(2).split("\\.")[0];//教职工2022基数 + String xx_szqk = String.valueOf((int) (Double.parseDouble(xx_jzg2022) - Double.parseDouble(xx_jzg)));//缺口、富裕 + if (2 + 1 > row37.size()) continue; + String xx_ysmj = row37.get(2);//园舍面积 + String xx_ysmj2022 = source2.getFirst().get(2);//园舍面积2022基数 + String xx_ysmjqk = String.format("%.2f", Double.parseDouble(xx_ysmj2022) - Double.parseDouble(xx_ysmj)); + + //初中 + String cz_jzg = row36.get(3).split("\\.")[0];//教职工数 + String cz_jzg2022 = source1.getFirst().get(3).split("\\.")[0];//教职工2022基数 + String cz_szqk = String.valueOf((int) (Double.parseDouble(cz_jzg2022) - Double.parseDouble(cz_jzg)));//缺口、富裕 + String cz_ysmj = row37.get(3);//园舍面积 + String cz_ysmj2022 = source2.getFirst().get(3);//园舍面积2022基数 + String cz_ysmjqk = String.format("%.2f", Double.parseDouble(cz_ysmj2022) - Double.parseDouble(cz_ysmj)); + + //高中 + String gz_jzg = row36.get(4).split("\\.")[0];//教职工数 + String gz_jzg2022 = source1.getFirst().get(4).split("\\.")[0];//教职工2022基数 + String gz_szqk = String.valueOf((int) (Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕 + String gz_ysmj = row37.get(4);//园舍面积 + String gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数 + String gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj)); + + ExcelKit.putData(outRow, Arrays.asList(year, areaName, + xq_jzg, xq_jzg2022, xq_szqk, xq_ysmj, xq_ysmj2022, xq_ysmjqk, // 学前 + xx_jzg, xx_jzg2022, xx_szqk, xx_ysmj, xx_ysmj2022, xx_ysmjqk, // 小学 + cz_jzg, cz_jzg2022, cz_szqk, cz_ysmj, cz_ysmj2022, cz_ysmjqk, // 初中 + gz_jzg, gz_jzg2022, gz_szqk, gz_ysmj, gz_ysmj2022, gz_ysmjqk, // 高中 + cityName), dataStyle); + } + } } } //保存文件