From 1a5eb2e8df1ef93b613d6718febbb83282774ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 11 Nov 2024 11:41:08 +0800
Subject: [PATCH] 'commit'

---
 ...¦å‰�教育入园总é‡�å�˜åŒ–å�Šé¢„测.xlsx | Bin 12429 -> 12429 bytes
 ...¥å›­æ€»é‡�å�˜åŒ–å�Šé¢„测ã€�æˆ�果】.xlsx | Bin 4027 -> 4472 bytes
 .../dsideal/base/Tools/FillData/City/C1.java  |  54 ++++++++++++++++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/Doc/待处�/市/�1】学�教育入园总��化�预测/学�教育入园总��化�预测.xlsx b/Doc/待处�/市/�1】学�教育入园总��化�预测/学�教育入园总��化�预测.xlsx
index 5c03af9137cc1eafb2b5c002f537dd6b4939dd9c..4fc45ab8c6debf778443b376863a932ab9c025c1 100644
GIT binary patch
delta 177
zcmeB8>`mke@MdNaVc_84V33O4$TN|VNh)^pd`1m0eUd2|OzW}aL&RBA!89BDIxxMB
z;{g{){S4uFRv^9jrvwv-`&&v2EUhjxTM)>fd_>nCM6v3bgD5*a8xU2aXA7cs>w)F|
d=sAGp^esVDr9N12m%cTK_g&u&MA;ko0RSdoFqZ%T

delta 177
zcmeB8>`mke@MdNaVc_84V0at7k!K<!)7$9H^BFb3^hu^<Fs;Xu4-scg1=DQo>%jCj
zjt5*I^)rOyS%LK8pAt+U?r$kAu(Z0&Y(XG@@)2Eo5XGuz4x;SzY(P|vo-K&ltp}F-
dqvrsY)3*dsmHJ@8UHaA_-gkXB5M^)R2LR}FLX7|b

diff --git a/Doc/待处�/市/�1】学�教育入园总��化�预测/学�教育入园总��化�预测��果】.xlsx b/Doc/待处�/市/�1】学�教育入园总��化�预测/学�教育入园总��化�预测��果】.xlsx
index d365efe7bb22ebed534f78f97e4225e7d4615147..264b9a6ff634d0d63eb3c38c7b1f38ee282a870d 100644
GIT binary patch
delta 2093
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
BZcP9H

delta 1726
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

diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
index 73d71a31..8f929283 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
@@ -111,15 +111,59 @@ public class C1 {
                     int rowIndex = 0;
                     Row outRow;
                     for (Row row : sheet) {
-                        //�历row中�一列，中间以tab隔开，然��行
+                        rowIndex++;
+                        if (rowIndex == 1) continue;
+                        //年份
+                        int columnIndex = 0;
+                        String value = ExcelReader.readCell(row.getCell(columnIndex));
+                        outRow = outSheet.createRow(rowIndex - 1);
+                        outRow.createCell(columnIndex).setCellValue(value);
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
+                        //总�分类
+                        columnIndex = 1;
+                        outRow.createCell(columnIndex).setCellValue("总入园数");
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
+                        //区域分类
+                        columnIndex = 2;
+                        outRow.createCell(columnIndex).setCellValue("");
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
 
+                        //总�数值
+                        columnIndex = 3;
+                        value = ExcelReader.readCell(row.getCell(4));
+                        outRow.createCell(columnIndex).setCellValue(value);
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
 
+                        //区域数值
+                        columnIndex = 4;
+                        outRow.createCell(columnIndex).setCellValue("");
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
+
+                        //行政区划
+                        columnIndex = 5;
+                        outRow.createCell(columnIndex).setCellValue(cityName);
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
+                        //上级行政区划
+                        columnIndex = 6;
+                        outRow.createCell(columnIndex).setCellValue("云��");
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
+                    }
+                    workbook.close();
+
+                    //==============================================================================
+                    //读�第28个图表
+                    XWPFChart chart28 = charts.get(27);
+                    workbook = chart28.getWorkbook();
+                    sheet = workbook.getSheet("Sheet1");
+                    //�历输出sheet的内容
+                    int secondRowIndex = 0;
+                    for (Row row : sheet) {
+                        secondRowIndex++;
+                        if (secondRowIndex == 1 || secondRowIndex == 2) continue;//表头和2022年都跳过
                         rowIndex++;
-                        if (rowIndex == 1) {
-                            continue;
-                        }
                         //年份
                         int columnIndex = 0;
+                        if(row.getCell(columnIndex)==null) break;
                         String value = ExcelReader.readCell(row.getCell(columnIndex));
                         outRow = outSheet.createRow(rowIndex - 1);
                         outRow.createCell(columnIndex).setCellValue(value);
@@ -154,9 +198,7 @@ public class C1 {
                         outRow.getCell(columnIndex).setCellStyle(dataStyle);
                     }
                     workbook.close();
-
                     break;
-                    //XWPFChart chart28 = charts.get(27);
                 }
             }
         }