'commit'

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_jzg = "0";
-                        String gz_jzg2022 = source1.getFirst().get(4).split("\\.")[0];//教职工2022基数
+                        String gz_jzg2022 = "0";
-                        String gz_szqk = String.valueOf((int) (Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕
+                        String gz_szqk = "0";
-                        String gz_ysmj = row37.get(4);//园舍面积
+                        String gz_ysmj = "0";
-                        String gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数
+                        String gz_ysmj2022 = "0";
-                        String gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj));
+                        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, // 学前

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<List<String>> 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_jzg = "0";
-                        String gz_jzg2022 = source1.getFirst().get(4).split("\\.")[0];//教职工2022基数
+                        String gz_jzg2022 = "0";
-                        String gz_szqk = String.valueOf((int) (Double.parseDouble(gz_jzg2022) - Double.parseDouble(gz_jzg)));//缺口、富裕
+                        String gz_szqk = "0";
-                        String gz_ysmj = row37.get(4);//园舍面积
+                        String gz_ysmj = "0";
-                        String gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数
+                        String gz_ysmj2022 = "0";
-                        String gz_ysmjqk = String.format("%.2f", Double.parseDouble(gz_ysmj2022) - Double.parseDouble(gz_ysmj));
+                        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());
-                }
 
             }
         }

src/main/java/com/dsideal/base/Tools/Test/A9.java

@@ -84,17 +84,14 @@ public class A9 {
                 List<List<String>> 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<String> 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);
-                }
 
             }
         }

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<File> 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 + "个图表");
-                }
             }
         }
     }