'commit'

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

@@ -1383,16 +1383,29 @@ public class ZbdcModel {
             for (Record record : list) {
                 String area_name = record.getStr("area_name");
                 if (!_map.containsKey(area_name)) {
-                    kv = Kv.by("count", 1);
                     kv.set("radio", record.getFloat("radio"));
                     _map.put(area_name, kv);
                 } else {
                     kv = _map.get(area_name);
-                    kv.set("count", kv.getInt("count") + 1);
                     kv.set("radio", kv.getFloat("radio") + record.getFloat("radio"));
                 }
             }
         }
+
+        String stageIds = "";
+        for (String s : kmList) {
+            if (s.startsWith("小学")) stageIds += "4,";
+            if (s.startsWith("初中")) stageIds += "5,";
+            if (s.startsWith("高中")) stageIds += "6,";
+        }
+        stageIds = stageIds.substring(0, stageIds.length() - 1);
+
+        for (Map.Entry<String, Kv> entry : _map.entrySet()) {
+            Kv kv = entry.getValue();
+            String area_name = entry.getKey();
+            List<Record> list = getSchoolListByAreaName(area_name, stageIds);
+            kv.set("count", list.size());
+        }
         return _map;
     }
 
@@ -1664,4 +1677,25 @@ public class ZbdcModel {
         String updateSql = "update t_zbdc_report set check_type_id=1 where year=? and area_id=? and report_level=2";
         Db.update(updateSql, year, area_id);
     }
+
+    /**
+     * 功能：获取指定区县下的学校列表，支持：市直，南关区，双阳区
+     *
+     * @param area_name
+     * @param stage_ids
+     * @return
+     */
+    public List<Record> getSchoolListByAreaName(String area_name, String stage_ids) {
+        String sql;
+        if (area_name.equals("市直")) {
+            //-- 市直属学校
+            sql = "select * from t_base_organization where org_id=bureau_id and org_type_id=9 and school_type_id in (select school_type_id from t_dm_schooltype_stage where stage_id in (" + stage_ids + "))";
+            return Db.find(sql);
+        } else {
+            String area_id = Db.findFirst("select * from t_dm_area where area_name=? and city_id='064BB3C9-E8DB-45ED-B0C1-6ABC5EA3B667'", area_name).getStr("area_id");
+            //--县区学校
+            sql = "select * from t_base_organization where org_id = bureau_id and org_type_id = 16  and school_type_id in(select school_type_id from t_dm_schooltype_stage where stage_id in(" + stage_ids + "))  and area_id = ? ";
+            return Db.find(sql, area_id);
+        }
+    }
 }