diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/【鲁甸县】学前幼儿入园总量预测.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/【鲁甸县】学前幼儿入园总量预测.xlsx deleted file mode 100644 index 8b360172..00000000 Binary files a/Doc/待处理/区/【1】学前幼儿入园总量预测/【鲁甸县】学前幼儿入园总量预测.xlsx and /dev/null differ diff --git a/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx new file mode 100644 index 00000000..08a6e252 Binary files /dev/null and b/Doc/待处理/区/【1】学前幼儿入园总量预测/学前幼儿入园总量预测.xlsx differ diff --git a/Doc/待处理/市/【11】教育资源配置发展预测/教育资源配置发展预测(人).xlsx b/Doc/待处理/市/【11】教育资源配置发展预测【没有成果】/教育资源配置发展预测(人).xlsx similarity index 100% rename from Doc/待处理/市/【11】教育资源配置发展预测/教育资源配置发展预测(人).xlsx rename to Doc/待处理/市/【11】教育资源配置发展预测【没有成果】/教育资源配置发展预测(人).xlsx diff --git a/Doc/待处理/市/【11】教育资源配置发展预测/昭通市人口变化及其对教育的影响20240416.docx b/Doc/待处理/市/【11】教育资源配置发展预测【没有成果】/昭通市人口变化及其对教育的影响20240416.docx similarity index 100% rename from Doc/待处理/市/【11】教育资源配置发展预测/昭通市人口变化及其对教育的影响20240416.docx rename to Doc/待处理/市/【11】教育资源配置发展预测【没有成果】/昭通市人口变化及其对教育的影响20240416.docx diff --git a/Doc/待处理/市/【11】教育资源配置发展预测/说明.txt b/Doc/待处理/市/【11】教育资源配置发展预测【没有成果】/说明.txt similarity index 100% rename from Doc/待处理/市/【11】教育资源配置发展预测/说明.txt rename to Doc/待处理/市/【11】教育资源配置发展预测【没有成果】/说明.txt diff --git a/Doc/待处理/市/【7】概览/概览【成果】.xlsx b/Doc/待处理/市/【7】概览/概览【成果】.xlsx deleted file mode 100644 index 02cdc4e6..00000000 Binary files a/Doc/待处理/市/【7】概览/概览【成果】.xlsx and /dev/null differ diff --git a/Doc/待处理/市/【7】概览/概览.xlsx b/Doc/待处理/市/【7】概览【有问题】/概览.xlsx similarity index 100% rename from Doc/待处理/市/【7】概览/概览.xlsx rename to Doc/待处理/市/【7】概览【有问题】/概览.xlsx diff --git a/Doc/待处理/市/【7】概览【有问题】/概览【成果】.xlsx b/Doc/待处理/市/【7】概览【有问题】/概览【成果】.xlsx new file mode 100644 index 00000000..fc047b4c Binary files /dev/null and b/Doc/待处理/市/【7】概览【有问题】/概览【成果】.xlsx differ diff --git a/Doc/待处理/市/【7】概览/说明.txt b/Doc/待处理/市/【7】概览【有问题】/说明.txt similarity index 100% rename from Doc/待处理/市/【7】概览/说明.txt rename to Doc/待处理/市/【7】概览【有问题】/说明.txt diff --git a/Doc/待处理/市/【7】概览/黄海解读.txt b/Doc/待处理/市/【7】概览【有问题】/黄海解读.txt similarity index 100% rename from Doc/待处理/市/【7】概览/黄海解读.txt rename to Doc/待处理/市/【7】概览【有问题】/黄海解读.txt diff --git a/Doc/待处理/市/【7】概览/（昭通市）汇总表.xlsx b/Doc/待处理/市/【7】概览【有问题】/（昭通市）汇总表.xlsx similarity index 100% rename from Doc/待处理/市/【7】概览/（昭通市）汇总表.xlsx rename to Doc/待处理/市/【7】概览【有问题】/（昭通市）汇总表.xlsx diff --git a/Doc/待处理/市/【8】人口总体情况【有问题】/人口总体情况.xlsx b/Doc/待处理/市/【8】人口总体情况【有问题】/人口总体情况.xlsx new file mode 100644 index 00000000..8406fa1a Binary files /dev/null and b/Doc/待处理/市/【8】人口总体情况【有问题】/人口总体情况.xlsx differ diff --git a/Doc/待处理/市/【8】人口总体情况【有问题】/人口总体情况【成果】.xlsx b/Doc/待处理/市/【8】人口总体情况【有问题】/人口总体情况【成果】.xlsx new file mode 100644 index 00000000..54f39716 Binary files /dev/null and b/Doc/待处理/市/【8】人口总体情况【有问题】/人口总体情况【成果】.xlsx differ diff --git a/Doc/待处理/市/【8】人口总体情况【有问题】/说明.txt b/Doc/待处理/市/【8】人口总体情况【有问题】/说明.txt new file mode 100644 index 00000000..067cd1dc --- /dev/null +++ b/Doc/待处理/市/【8】人口总体情况【有问题】/说明.txt @@ -0,0 +1,12 @@ +数据从 （昭通市）汇总表.xls 文件中获取 + +城镇化率 = 城镇人口 / 总人口 保留两位小数 + +总人口:B +城镇人口:D +乡村人口:E +城镇化率:计算， + +每项需要除以10000 + +单位：万人 \ No newline at end of file diff --git a/Doc/待处理/市/【8】人口总体情况【有问题】/（昭通市）汇总表.xls b/Doc/待处理/市/【8】人口总体情况【有问题】/（昭通市）汇总表.xls new file mode 100644 index 00000000..ae5b9b06 Binary files /dev/null and b/Doc/待处理/市/【8】人口总体情况【有问题】/（昭通市）汇总表.xls differ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java index 2bbe1324..405b153e 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java @@ -19,7 +19,7 @@ import java.util.List; public class A1 { //示例Excel - static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\市\\【8】人口总体情况\\人口总体情况.xlsx"; + static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【1】学前幼儿入园总量预测\\学前幼儿入园总量预测.xlsx"; //源文件 static String parentPath = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\133个县区报告2022\\县区研究报告"; @@ -57,20 +57,88 @@ public class A1 { if (file.isDirectory()) continue; if (!file.getName().endsWith(".xlsx") && !file.getName().endsWith(".xls")) continue; - //城市名称 - String cityName = ru.getCityOrAreaName(file.getName()); + + //县区名称 + String areaName = ru.getCityOrAreaName(file.getName()); + if (StrKit.isBlank(areaName)) { + System.out.println("发现异常数据，请人工处理：" + file.getName()); + System.exit(0); + } + + //市州名称 + //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出 + String parentPathName = file.getParentFile().getName(); + String cityName = ru.getCityOrAreaName(parentPathName); + if (StrKit.isBlank(cityName) || cityName.equals(areaName)) { + parentPathName = file.getParentFile().getParentFile().getName(); + cityName = ru.getCityOrAreaName(parentPathName); + } if (StrKit.isBlank(cityName)) { System.out.println("发现异常数据，请人工处理：" + file.getName()); System.exit(0); } - System.out.println("正在进行" + cityName + "的数据填充~"); + //县区名称 + System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~"); String sourceExcel = file.getAbsolutePath(); - //System.out.println(file.getName()); List> dataList = ExcelKit.readSecondTable(sourceExcel, 0, "自动计算招生数、在校生数", 2, "K"); - ExcelKit.printTable(dataList); - break; + + //入园总数 + for (List stringList : dataList) { + //年份 + int year = Integer.parseInt(stringList.get(0)); + //3预测总招生数 + int zss = Integer.parseInt(stringList.get(3).split("\\.")[0]); + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), + "总入园数", "", String.valueOf(zss), "", areaName, cityName), dataStyle); + } + //2022入园基数 + for (List ignored : dataList) { + //年份 + int year = 2022; + //3预测总招生数 + int zss = Integer.parseInt(dataList.getFirst().get(3).split("\\.")[0]); + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), + "2022年基数", "", String.valueOf(zss), "", areaName, cityName), dataStyle); + } + + //城区 + for (List stringList : dataList) { + //年份 + int year = Integer.parseInt(stringList.get(0)); + //4修正城区招生A + int v = Integer.parseInt(stringList.get(4).split("\\.")[0]); + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), + "", "城区", "", String.valueOf(v), areaName, cityName), dataStyle); + + } + + //镇区 + for (List stringList : dataList) { + //年份 + int year = Integer.parseInt(stringList.get(0)); + + int v = Integer.parseInt(stringList.get(5).split("\\.")[0]); + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), + "", "镇区", "", String.valueOf(v), areaName, cityName), dataStyle); + + } + + //乡村 + for (List stringList : dataList) { + //年份 + int year = Integer.parseInt(stringList.get(0)); + int v = Integer.parseInt(stringList.get(5).split("\\.")[0]); + Row outRow = outSheet.createRow(++rowIndex); + ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), + "", "乡村", "", String.valueOf(v), areaName, cityName), dataStyle); + + } } } //保存文件 diff --git a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java index 8fad5293..887258bb 100644 --- a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java +++ b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java @@ -17,6 +17,7 @@ public class ReadDocxUtil { public DataEaseModel dm = new DataEaseModel(); public String privinceName = "云南省"; + /** * 获取云南省下所有城市名称 *