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

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

@@ -1505,7 +1505,13 @@ public class ZbdcModel {
         if (StrKit.isBlank(keyword)) keyword = "";
         Page<Record> p;
         Map<String, Record> _map = getSchoolAreaName();
-        String tSql = "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum,(xx_ck_js_sum+cz_ck_js_sum+gz_ck_js_sum) as summary_ck_js_sum,(xx_ck_mj_sum+cz_ck_mj_sum+gz_ck_mj_sum) as summary_ck_mj_sum";
+        String tSql = "select *,(xx_ldjy_qt_sum+cz_ldjy_qt_sum) as summary_ldjy_qt_sum,(xx_ck_js_sum+cz_ck_js_sum+gz_ck_js_sum) as summary_ck_js_sum,(xx_ck_mj_sum+cz_ck_mj_sum+gz_ck_mj_sum) as summary_ck_mj_sum,";
+        //护眼灯教室 护眼灯功能室
+        tSql += "xx_hjddjzsks+xx_hjddwjzsks as xx_hydjs,xx_hjddjzgnqshu+xx_hjddwjzgnqshu as xx_hydgns,";
+        tSql += "cz_hjddjzsks+cz_hjddwjzsks as cz_hydjs,cz_hjddjzgnqshu+cz_hjddwjzgnqshu as cz_hydgns,";
+        tSql += "gz_hjddjzsks+gz_hjddwjzsks as gz_hydjs,gz_hjddjzgnqshu+gz_hjddwjzgnqshu as gz_hydgns,";
+        tSql += "xx_hjddjzsks+xx_hjddwjzsks +cz_hjddjzsks+cz_hjddwjzsks+gz_hjddjzsks+gz_hjddwjzsks as summary_hydjs,xx_hjddjzgnqshu+xx_hjddwjzgnqshu+cz_hjddjzgnqshu+cz_hjddwjzgnqshu+gz_hjddjzgnqshu+gz_hjddwjzgnqshu as summary_hydgns";
+
         if (StrKit.isBlank(bureau_id)) {
             if (!StrKit.isBlank(area_id)) {
                 String bureauIds = getBureauIds(area_id, school_type_id, keyword);
@@ -2753,7 +2759,7 @@ public class ZbdcModel {
                 Element inputNext = elements.get(i + 1);//下一个必定是面积
                 mj = Double.parseDouble(inputNext.attr("value"));//面积
 
-                  //创客面积
+                //创客面积
                 if (xdkm.startsWith("xx_ck") || xdkm.startsWith("cz_ck") || xdkm.startsWith("gz_ck")) {
                     mj_sum += mj;
                     js_sum++;