Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

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));//单位：万平方米
                         }
                     }
                 }
@@ -167,10 +167,10 @@ public class A12 {
                         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);
                     }
                 }