From 1076a3c21e7c496b6c2cc3472cf7dcddcf1bba81 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:58:07 +0800
Subject: [PATCH] 'commit'

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

diff --git a/Doc/待处�/市/�1】学�教育入园总��化�预测/学�教育入园总��化�预测.xlsx b/Doc/待处�/市/�1】学�教育入园总��化�预测/学�教育入园总��化�预测.xlsx
index 4fc45ab8c6debf778443b376863a932ab9c025c1..6937f16d6d60e150395a2158d59384a56778ae8d 100644
GIT binary patch
delta 177
zcmeB8>`mke@MdNaVc_84V3;1ak!K<!)AYE_^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^)R2LPVkJ8J*{

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

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

delta 2030
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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 292d27c2..9e6b5d62 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
@@ -3,6 +3,7 @@ package com.dsideal.base.Tools.FillData.City;
 import com.dsideal.base.DataEase.Model.ExcelReader;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.dsideal.base.Tools.Util.ReadDocxUtil;
+import com.jfinal.kit.StrKit;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.ss.usermodel.*;
@@ -77,7 +78,6 @@ public class C1 {
         }
         sampleWorkbook.close();
 
-
         //开始读�市州word文档
         String parentPath = "D:\\dsWork\\YunNanDsBase\\Doc\\全��州市县区人�与教育报告集20241023\\16个州市报告2022\\分�报告20240510";
 
@@ -155,15 +155,20 @@ public class C1 {
                     XWPFChart chart28 = charts.get(27);
                     workbook = chart28.getWorkbook();
                     sheet = workbook.getSheet("Sheet1");
+                    String jiShu="";
                     //�历输出sheet的内容
                     int secondRowIndex = 0;
                     for (Row row : sheet) {
                         secondRowIndex++;
-                        if (secondRowIndex == 1 || secondRowIndex == 2) continue;//表头和2022年都跳过
+
+                        if (secondRowIndex == 1) continue;//表头都跳过
+                        if (secondRowIndex == 2) {//2022年是��的，�一回就行了
+                            jiShu = ExcelReader.readCell(row.getCell(4));//2022年基数
+                        }
                         rowIndex++;
                         //年份
                         int columnIndex = 0;
-                        if(row.getCell(columnIndex)==null) break;
+                        if (row.getCell(columnIndex) == null) break;
                         String value = ExcelReader.readCell(row.getCell(columnIndex));
                         outRow = outSheet.createRow(rowIndex - 1);
                         outRow.createCell(columnIndex).setCellValue(value);
@@ -194,7 +199,52 @@ public class C1 {
                         outRow.createCell(columnIndex).setCellValue("云��");
                         outRow.getCell(columnIndex).setCellStyle(dataStyle);
                     }
+
+                    //��读�，跳过表头
+                    rowIndex--;
+                    for (Row row : sheet) {
+                        //年份
+                        int columnIndex = 0;
+                        if (row.getCell(columnIndex) == null) break;
+                        String value = ExcelReader.readCell(row.getCell(columnIndex));
+                        if(StrKit.isBlank(value)) continue;
+                        rowIndex++;
+                        outRow = outSheet.createRow(rowIndex - 1);
+                        outRow.createCell(columnIndex).setCellValue(value);
+                        outRow.getCell(columnIndex).setCellStyle(dataStyle);
+                        //总�分类
+                        columnIndex = 1;
+                        outRow.createCell(columnIndex).setCellValue("2022年基数");
+                        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(jiShu);
+                        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();
+
+                    //城区
+
+                    //镇区
+
+                    //乡�
                     break;
                 }
             }