From 72f551767b58b51c65d2bf18e0fdf0a9a335c73c 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 15:11:49 +0800 Subject: [PATCH] 'commit' --- ...ŸŽé•‡&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ.xlsx | Bin 9181 -> 9181 bytes ...人å£å˜åŒ–åŠé¢„测-åŒã€æˆæžœã€‘.xlsx | Bin 8485 -> 6474 bytes .../dsideal/base/Tools/FillData/City/C10.java | 26 ++++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Doc/待处ç†/市/ã€10】城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ/城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ.xlsx b/Doc/待处ç†/市/ã€10】城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ/城镇&乡æ‘人å£å˜åŒ–åŠé¢„测-åŒ.xlsx index 6549bb15b1ba5724651368711af753763023ddf1..1e25d6cc4e716d41cf726d43cc1b1e8a445863d4 100644 GIT binary patch delta 177 zcmccXe%GBRz?+#xgn@&DgCVhUBhN%ero_t4^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 bmZC{U@(wCXVlq?Apd*H~IQBhq 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 Y%b(i charts = ExcelKit.getSortListForXWPFChart(doc.getCharts()); //æ•°æ®åœ¨å›¾è¡¨2 - int firstChartNumber = 1,secondChartNumber = 3; + int firstChartNumber = 1, secondChartNumber = 3; XSSFWorkbook workbook = charts.get(firstChartNumber).getWorkbook(); List> source1 = ExcelKit.readSheet(workbook, 6);//从2017年开始 @@ -93,11 +94,26 @@ public class C10 { double 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); - } else { - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云å—çœ",cityName, r.getFirst(),"", String.format("%.2f", cvalue),"" ,String.format("%.2f", xvalue))), dataStyle); + 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); +// } +// } } } }