diff --git a/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx b/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx index a2d6518b..29c6dde2 100644 Binary files a/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx and b/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx differ diff --git a/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测【成果】.xlsx b/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测【成果】.xlsx index 4cb9d8fa..fc223216 100644 Binary files a/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测【成果】.xlsx and b/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测【成果】.xlsx differ diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx index f07b9862..13123f9b 100644 Binary files a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx and b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx differ diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx index f9f3382c..0344e6b0 100644 Binary files a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx and b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx differ diff --git a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx index 6385291d..431a7181 100644 Binary files a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx and b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx differ diff --git a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx deleted file mode 100644 index 55a24894..00000000 Binary files a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx and /dev/null differ diff --git a/Doc/有问题的县区/富宁县(空35).docx b/Doc/有问题的县区/富宁县(空35).docx deleted file mode 100644 index ec6467ba..00000000 Binary files a/Doc/有问题的县区/富宁县(空35).docx and /dev/null differ diff --git a/Doc/有问题的县区/德钦县(空35).docx b/Doc/有问题的县区/德钦县(空35).docx deleted file mode 100644 index 02c6d402..00000000 Binary files a/Doc/有问题的县区/德钦县(空35).docx and /dev/null differ diff --git a/Doc/有问题的县区/新香格里拉(空35).docx b/Doc/有问题的县区/新香格里拉(空35).docx deleted file mode 100644 index 6f85ab0c..00000000 Binary files a/Doc/有问题的县区/新香格里拉(空35).docx and /dev/null differ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java index 287c6340..b4ae07ed 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java @@ -151,12 +151,21 @@ public class A12 { String cz_ysmjqk = String.format("%.2f", Double.parseDouble(cz_ysmj2022) - Double.parseDouble(cz_ysmj)); //高中 - String gz_jzg = row36.get(4).split("\\.")[0];//教职工数 - String gz_jzg2022 = source1.getFirst().get(4).split("\\.")[0];//教职工2022基数 - String gz_szqk = String.valueOf((int) (Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕 - String gz_ysmj = row37.get(4);//园舍面积 - String gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数 - String gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj)); + String gz_jzg = "0"; + String gz_jzg2022 = "0"; + String gz_szqk = "0"; + String gz_ysmj = "0"; + String gz_ysmj2022 = "0"; + String gz_ysmjqk = "0"; + try { + gz_jzg = row36.get(4).split("\\.")[0];//教职工数 + gz_jzg2022 = source1.getFirst().get(4).split("\\.")[0];//教职工2022基数 + gz_szqk = String.valueOf((int) (Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕 + gz_ysmj = row37.get(4);//园舍面积 + gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数 + gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj)); + } catch (Exception err) { + } DsKit.putData(outRow, Arrays.asList(year, areaName, xq_jzg, xq_jzg2022, xq_szqk, String.format("%.2f", Double.parseDouble(xq_ysmj)), String.format("%.2f", Double.parseDouble(xq_ysmj2022)), xq_ysmjqk, // 学前 diff --git a/src/main/java/com/dsideal/base/Tools/Test/A12.java b/src/main/java/com/dsideal/base/Tools/Test/A12.java index 1be9118d..6426169f 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/A12.java +++ b/src/main/java/com/dsideal/base/Tools/Test/A12.java @@ -79,7 +79,6 @@ public class A12 { System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~"); int chartNumber = 36; List> source1 = DsKit.getChartData(file.getAbsolutePath(), chartNumber, 0); - try { //需要处理下人与万人的单位兼容 if (source1 != null) { @@ -151,12 +150,21 @@ public class A12 { String cz_ysmjqk = String.format("%.2f", Double.parseDouble(cz_ysmj2022) - Double.parseDouble(cz_ysmj)); //高中 - String gz_jzg = row36.get(4).split("\\.")[0];//教职工数 - String gz_jzg2022 = source1.getFirst().get(4).split("\\.")[0];//教职工2022基数 - String gz_szqk = String.valueOf((int) (Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕 - String gz_ysmj = row37.get(4);//园舍面积 - String gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数 - String gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj)); + String gz_jzg = "0"; + String gz_jzg2022 = "0"; + String gz_szqk = "0"; + String gz_ysmj = "0"; + String gz_ysmj2022 = "0"; + String gz_ysmjqk = "0"; + try { + gz_jzg = row36.get(4).split("\\.")[0];//教职工数 + gz_jzg2022 = source1.getFirst().get(4).split("\\.")[0];//教职工2022基数 + gz_szqk = String.valueOf((int) (Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕 + gz_ysmj = row37.get(4);//园舍面积 + gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数 + gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj)); + } catch (Exception err) { + } DsKit.putData(outRow, Arrays.asList(year, areaName, xq_jzg, xq_jzg2022, xq_szqk, String.format("%.2f", Double.parseDouble(xq_ysmj)), String.format("%.2f", Double.parseDouble(xq_ysmj2022)), xq_ysmjqk, // 学前 @@ -166,9 +174,6 @@ public class A12 { cityName), dataStyle); } } - } catch (Exception err) { - System.out.println(err.toString()); - } } } diff --git a/src/main/java/com/dsideal/base/Tools/Test/A9.java b/src/main/java/com/dsideal/base/Tools/Test/A9.java index 5bb4fa4a..fc2a97e3 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/A9.java +++ b/src/main/java/com/dsideal/base/Tools/Test/A9.java @@ -84,17 +84,14 @@ public class A9 { List> source1 = DsKit.getChartData(file.getAbsolutePath(), chartNumber, 0); - - DsKit.printTable(source1); - - try{ - //需要处理下人与万人的单位兼容 + //需要处理下人与万人的单位兼容 int mul = 1; if (source1 != null) { //本例中要乘以多少呢？ String xmlPath = DsKit.DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml"; mul = DsKit.getMul(xmlPath); + DsKit.printTable(source1); for (List row : source1) { String year = row.getFirst().split("\\.")[0]; year = year.replace("年", ""); @@ -144,9 +141,6 @@ public class A9 { DsKit.putData(outRow, Arrays.asList(cityName, areaName, year, "", v1, "", v2), dataStyle); } } - }catch (Exception err){ - System.out.println(err); - } } } diff --git a/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java b/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java index d09b0a3e..ddba53a9 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java +++ b/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java @@ -21,12 +21,11 @@ public class CountDocxTuBiao { //String sourceDoc = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【12】新-教育资源配置发展预测\\（6.11鲁甸县）《县（区）人口变化及其对教育的影响》(4).docx"; //找到parentPath下一级目录中所有文件 - String parentPath = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\133个县区报告2022\\县区研究报告"; + String parentPath = "D:\\dsWork\\YunNanDsBase\\Doc\\有问题的县区"; List files = FileUtil.loopFiles(parentPath, file -> true); //处理这个目录 if (files != null) { for (File file : files) { - //if(!file.getName().contains("隆阳"))continue; //判断file是不是目录，是目录的需要跳过 if (file.isDirectory()) continue; if (!file.getName().endsWith(".docx") || file.getName().startsWith("~")) @@ -42,9 +41,7 @@ public class CountDocxTuBiao { break; } } - if (chartNumber != 37) { - System.out.println(file.getAbsolutePath() + " 共" + chartNumber + "个图表"); - } + System.out.println(file.getAbsolutePath() + " 共" + chartNumber + "个图表"); } } }