'commit'

src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java

@@ -104,7 +104,7 @@ public class A12 {
                 chartNumber = 37;
                 List<List<String>> source2 = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 0);
 
-                 //需要处理下平方米与万平方米的单位兼容
+                //需要处理下平方米与万平方米的单位兼容
                 if (source2 != null) {
                     //本例中要乘以多少呢？
                     String xmlPath = ExcelKit.DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml";
@@ -112,7 +112,7 @@ public class A12 {
                     for (List<String> row : source2) {
                         for (int j = 1; j <= 4; j++) {
                             if (j + 1 > row.size()) continue;
-                            row.set(j, String.valueOf(Double.parseDouble(row.get(j)) * mul/10000));//单位：万平方米
+                            row.set(j, String.valueOf(Double.parseDouble(row.get(j)) * mul / 10000));//单位：万平方米
                         }
                     }
                 }
@@ -133,11 +133,11 @@ public class A12 {
                         String xq_szqk = String.valueOf((int) (Double.parseDouble(xq_jzg2022) - Double.parseDouble(xq_jzg)));//缺口、富裕
                         String xq_ysmj = null;//园舍面积
                         if (row37 != null) {
-                            xq_ysmj = String.format("%.2f",row37.get(1));
+                            xq_ysmj = row37.get(1);
                         }
                         String xq_ysmj2022 = null;//园舍面积2022基数
                         if (source2 != null) {
-                            xq_ysmj2022 = String.format("%.2f",source2.getFirst().get(1));
+                            xq_ysmj2022 = source2.getFirst().get(1);
                         }
                         String xq_ysmjqk = String.format("%.2f", Double.parseDouble(xq_ysmj2022) - Double.parseDouble(xq_ysmj));
 
@@ -146,31 +146,31 @@ public class A12 {
                         String xx_jzg2022 = source1.getFirst().get(2).split("\\.")[0];//教职工2022基数
                         String xx_szqk = String.valueOf((int) (Double.parseDouble(xx_jzg2022) - Double.parseDouble(xx_jzg)));//缺口、富裕
                         if (2 + 1 > row37.size()) continue;
-                        String xx_ysmj = String.format("%.2f",row37.get(2));//园舍面积
-                        String xx_ysmj2022 = String.format("%.2f",source2.getFirst().get(2));//园舍面积2022基数
+                        String xx_ysmj = row37.get(2);//园舍面积
+                        String xx_ysmj2022 = source2.getFirst().get(2);//园舍面积2022基数
                         String xx_ysmjqk = String.format("%.2f", Double.parseDouble(xx_ysmj2022) - Double.parseDouble(xx_ysmj));
 
                         //初中
                         String cz_jzg = row36.get(3).split("\\.")[0];//教职工数
                         String cz_jzg2022 = source1.getFirst().get(3).split("\\.")[0];//教职工2022基数
                         String cz_szqk = String.valueOf((int) (Double.parseDouble(cz_jzg2022) - Double.parseDouble(cz_jzg)));//缺口、富裕
-                        String cz_ysmj = String.format("%.2f",row37.get(3));//园舍面积
-                        String cz_ysmj2022 = String.format("%.2f",source2.getFirst().get(3));//园舍面积2022基数
+                        String cz_ysmj = row37.get(3);//园舍面积
+                        String cz_ysmj2022 = source2.getFirst().get(3);//园舍面积2022基数
                         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 = String.format("%.2f",row37.get(4));//园舍面积
-                        String gz_ysmj2022 = String.format("%.2f",source2.getFirst().get(4));//园舍面积2022基数
+                        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));
 
                         ExcelKit.putData(outRow, Arrays.asList(year, areaName,
-                                xq_jzg, xq_jzg2022, xq_szqk, xq_ysmj, xq_ysmj2022, xq_ysmjqk, // 学前
-                                xx_jzg, xx_jzg2022, xx_szqk, xx_ysmj, xx_ysmj2022, xx_ysmjqk, // 小学
-                                cz_jzg, cz_jzg2022, cz_szqk, cz_ysmj, cz_ysmj2022, cz_ysmjqk, // 初中
-                                gz_jzg, gz_jzg2022, gz_szqk, gz_ysmj, gz_ysmj2022, gz_ysmjqk, // 高中
+                                xq_jzg, xq_jzg2022, xq_szqk, String.format("%.2f", Double.parseDouble(xq_ysmj)), String.format("%.2f", Double.parseDouble(xq_ysmj2022)), xq_ysmjqk, // 学前
+                                xx_jzg, xx_jzg2022, xx_szqk, String.format("%.2f", Double.parseDouble(xx_ysmj)), String.format("%.2f", Double.parseDouble(xx_ysmj2022)), xx_ysmjqk, // 小学
+                                cz_jzg, cz_jzg2022, cz_szqk, String.format("%.2f", Double.parseDouble(cz_ysmj)), String.format("%.2f", Double.parseDouble(cz_ysmj2022)), cz_ysmjqk, // 初中
+                                gz_jzg, gz_jzg2022, gz_szqk, String.format("%.2f", Double.parseDouble(gz_ysmj)), String.format("%.2f", Double.parseDouble(gz_ysmj2022)), gz_ysmjqk, // 高中
                                 cityName), dataStyle);
                     }
                 }