'commit'

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

@@ -1505,24 +1505,26 @@ 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";
         if (StrKit.isBlank(bureau_id)) {
             if (!StrKit.isBlank(area_id)) {
                 String bureauIds = getBureauIds(area_id, school_type_id, keyword);
+                
                 if (StrKit.isBlank(bureauIds)) {
-                    p = Db.paginate(page, limit, "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", "from t_zbdc_bureau_cgzb where 1=2");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where 1=2");
                 } else {
-                    p = Db.paginate(page, limit, "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", "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
                 }
             } else {
                 if (school_type_id > 0) {
                     String school_type_name = getSchoolTypeName(school_type_id);
-                    p = Db.paginate(page, limit, "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", "from t_zbdc_bureau_cgzb where year=" + year + " and school_type_name='" + school_type_name + "' and bureau_name like '%" + keyword + "%'  order by bureau_id");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where year=" + year + " and school_type_name='" + school_type_name + "' and bureau_name like '%" + keyword + "%'  order by bureau_id");
                 } else {
-                    p = Db.paginate(page, limit, "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", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%'  order by bureau_id");
+                    p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%'  order by bureau_id");
                 }
             }
         } else {
-            p = Db.paginate(page, limit, "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", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_id='" + bureau_id + "'");
+            p = Db.paginate(page, limit, tSql, "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_id='" + bureau_id + "'");
         }
 
         //配备情况