'commit'

src/main/java/com/dsideal/base/Tools/FillData/City/C10.java

@@ -73,18 +73,17 @@ public class C10 {
                     //排序后的图表
                     List<XWPFChart> 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<List<String>> source1 = ExcelKit.readSheet(workbook, 6);//从2017年开始
 
-                    workbook = charts.get(secondChartNumber).getWorkbook();
+                    workbook = charts.get(secondChartNumber - 1).getWorkbook();
                     List<List<String>> source3 = ExcelKit.readSheet(workbook, 2);//从2023年开始
 
                     //遍历source1
                     for (List<String> 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<String> 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<String> 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);
+                        }
+                    }
                 }
             }
         }