'commit'

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

@@ -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 = row37.get(1);
+                            xq_ysmj = String.format("%.2f",row37.get(1));
                         }
                         String xq_ysmj2022 = null;//园舍面积2022基数
                         if (source2 != null) {
-                            xq_ysmj2022 = source2.getFirst().get(1);
+                            xq_ysmj2022 = String.format("%.2f",source2.getFirst().get(1));
                         }
                         String xq_ysmjqk = String.format("%.2f", Double.parseDouble(xq_ysmj2022) - Double.parseDouble(xq_ysmj));
 
@@ -146,24 +146,24 @@ 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 = row37.get(2);//园舍面积
-                        String xx_ysmj2022 = source2.getFirst().get(2);//园舍面积2022基数
+                        String xx_ysmj = String.format("%.2f",row37.get(2));//园舍面积
+                        String xx_ysmj2022 = String.format("%.2f",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 = row37.get(3);//园舍面积
-                        String cz_ysmj2022 = source2.getFirst().get(3);//园舍面积2022基数
+                        String cz_ysmj = String.format("%.2f",row37.get(3));//园舍面积
+                        String cz_ysmj2022 = String.format("%.2f",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 = row37.get(4);//园舍面积
-                        String gz_ysmj2022 = source2.getFirst().get(4);//园舍面积2022基数
+                        String gz_ysmj = String.format("%.2f",row37.get(4));//园舍面积
+                        String gz_ysmj2022 = String.format("%.2f",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,