'commit'

src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java

@@ -2130,6 +2130,50 @@ public class ZbdcModel {
             }
         }
         res = expandList(res, year);
+        //添加需求：区域汇总，以上学科各教室实建室数大于应建室数的，按应建室数统计（多出部分不纳入到统计中）
+        for (int i = 0; i < res.size(); i++) {
+            Record record = res.get(i);
+            //小学科学
+            record.set("xx_kxsysshshu", Math.min(record.getInt("xx_kxsysshshu_need"), record.getInt("xx_kxsysshshu")));
+
+            //初中实验室
+            record.set("cz_wllshshshu", Math.min(record.getInt("cz_wllshshshu_need"), record.getInt("cz_wllshshshu")));//初中物理实验室应建室数
+            record.set("cz_hxlshshshu", Math.min(record.getInt("cz_hxlshshshu_need"), record.getInt("cz_hxlshshshu")));//初中化学实验室应建室数
+            record.set("cz_swlshshshu", Math.min(record.getInt("cz_swlshshshu_need"), record.getInt("cz_swlshshshu")));//初中生物实验室应建室数
+            //高中实验室
+            record.set("gz_wllshshshu", Math.min(record.getInt("gz_wllshshshu_need"), record.getInt("gz_wllshshshu")));//高中物理实验室应建室数
+            record.set("gz_hxlshshshu", Math.min(record.getInt("gz_hxlshshshu_need"), record.getInt("gz_hxlshshshu")));//高中化学实验室应建室数
+            record.set("gz_swlshshshu", Math.min(record.getInt("gz_swlshshshu_need"), record.getInt("gz_swlshshshu")));//高中生物实验室应建室数
+
+            //初中生物
+            record.set("cz_swyqshshu", Math.min(record.getInt("cz_swyqshshu"), 1));//仪器室数量
+            record.set("cz_swzbrshshu", Math.min(record.getInt("cz_swzbrshshu"), 1));//准备室数量
+            record.set("cz_swypsshu", Math.min(record.getInt("cz_swypsshu"), 1));//药品室数量
+
+            //初中化学
+            record.set("cz_hxyqshshu", Math.min(record.getInt("cz_hxyqshshu"), 1));//仪器室数量
+            record.set("cz_hxzbrshshu", Math.min(record.getInt("cz_hxzbrshshu"), 1));//准备室数量
+            record.set("cz_hxypsshu", Math.min(record.getInt("cz_hxypsshu"), 1));//药品室数量
+
+            //初中物理
+            record.set("cz_wllyqshshu", Math.min(record.getInt("cz_wllyqshshu"), 1));//仪器室数量
+            record.set("cz_wllzbrshshu", Math.min(record.getInt("cz_wllzbrshshu"), 1));//准备室数量
+
+            //高中生物
+            record.set("gz_swyqshshu", Math.min(record.getInt("gz_swyqshshu"), 1));//仪器室数量
+            record.set("gz_swzbrshshu", Math.min(record.getInt("gz_swzbrshshu"), 1));//准备室数量
+            record.set("gz_swypsshu", Math.min(record.getInt("gz_swypsshu"), 1));//药品室数量
+
+            //高中化学
+            record.set("gz_hxyqshshu", Math.min(record.getInt("gz_hxyqshshu"), 1));//仪器室数量
+            record.set("gz_hxzbrshshu", Math.min(record.getInt("gz_hxzbrshshu"), 1));//准备室数量
+            record.set("gz_hxypsshu", Math.min(record.getInt("gz_hxypsshu"), 1));//药品室数量
+
+            //高中物理
+            record.set("gz_wllyqshshu", Math.min(record.getInt("gz_wllyqshshu"), 1));//仪器室数量
+            record.set("gz_wllzbrshshu", Math.min(record.getInt("gz_wllzbrshshu"), 1));//准备室数量
+
+        }
         addSummaryRow(res);
         return res;
     }