diff --git a/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx b/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx index 9dad66ac..5683382b 100644 Binary files a/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx and b/Doc/待处理/区/【12】新-教育资源配置发展预测/新-教育资源配置发展预测.xlsx 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 ba371527..aa1cea92 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 @@ -125,6 +125,7 @@ public class A12 { String xx_jzg = row36.get(2);//教职工数 String xx_jzg2022 = source36.getFirst().get(2);//教职工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 = source37.getFirst().get(2);//园舍面积2022基数 String xx_ysmjqk = String.format("%.2f", Double.parseDouble(xx_ysmj2022) - Double.parseDouble(xx_ysmj));