From b6f0ac9a9e3b98c28aa0573260cc3e0d92beff61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 13 May 2024 16:49:44 +0800 Subject: [PATCH 1/2] 'commit' --- .../java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java | 8 ++++++-- src/main/resource/Sql/Zbdc.sql | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java index c1faf295..e1e534a1 100644 --- a/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java +++ b/src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java @@ -439,6 +439,9 @@ public class ZbdcModel { } else { sql = sql.replace("$bureau_ids$", "''"); } + + sql=sql.replace("${km_code}$",km_code); + List listCross = Db.find(sql); for (Record cross : listCross) { @@ -487,7 +490,7 @@ public class ZbdcModel { it.remove(); // 从迭代器中删除不符合条件的记录 } } - } + } Page pList = new Page<>(listCross.subList(page - 1, page - 1 + limit), page, limit, listCross.size(), listCross.size()); return pList; @@ -1101,7 +1104,8 @@ public class ZbdcModel { Map _mapSchoolName = getSchoolNameMap(); Map _mapSchoolTypeName = getSchoolTypeNameMap(); - Page p = Db.paginate(page, limit, "select t1.*,t2.lb_name,t2.lb_sb_name ", "from " + table_name + " as t1 inner join t_zbdc_table_lbsb as t2 on t1.lb_sb_id=t2.lb_sb_id where t1.school_id in (" + bureauIds + ") and year=" + year + " order by school_id"); + sql = "from " + table_name + " as t1 inner join t_zbdc_table_lbsb as t2 on t1.lb_sb_id=t2.lb_sb_id where t1.school_id in (" + bureauIds + ") and year=" + year + " order by school_id"; + Page p = Db.paginate(page, limit, "select t1.*,t2.lb_name,t2.lb_sb_name ", sql); Map _map = getSchoolAreaName(); for (Record record : p.getList()) { record.set("bureau_name", _mapSchoolName.get(record.getStr("school_id"))); diff --git a/src/main/resource/Sql/Zbdc.sql b/src/main/resource/Sql/Zbdc.sql index b9872de3..3ef409f6 100644 --- a/src/main/resource/Sql/Zbdc.sql +++ b/src/main/resource/Sql/Zbdc.sql @@ -205,9 +205,10 @@ #sql("getQueryYqsbCross") select t1.*,t2.org_id,t2.org_name as bureau_name,t3.area_name,t4.school_type_name from t_zbdc_templet as t1 cross join t_base_organization as t2 - inner join t_dm_area as t3 on t2.area_id=t3.area_id + inner join t_dm_area as t3 on t2.area_id=t3.area_id inner join t_dm_schooltype as t4 on t2.school_type_id=t4.school_type_id - where t2.org_id in ($bureau_ids$) order by t1.templet_id,t2.org_name + where t1.km_code='${km_code}$' and + t2.org_id in ($bureau_ids$) order by t1.templet_id,t2.org_name #end #sql("getQueryYqsb") From de4c2b15e0d31ef183f7a4236bd110500c591af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 13 May 2024 19:50:44 +0800 Subject: [PATCH 2/2] 'commit' --- .../QingLong/Zbdc/Controller/ZbdcController.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java b/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java index d286aac0..9e0d58ad 100644 --- a/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java +++ b/src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java @@ -515,10 +515,10 @@ public class ZbdcController extends Controller { @IsLoginInterface({}) @EmptyInterface({"km_code"}) // http://10.10.21.20:9000/QingLong/zbdc/getQueryYqsb?page=1&limit=15&area_id=&school_type_id=312&km_code=czyl&level_filter=&keyword= - public void getQueryYqsb(String area_id, int school_type_id, String keyword, String km_code, String level_filter, int year,int type_id, int page, int limit) { + public void getQueryYqsb(String area_id, int school_type_id, String keyword, String km_code, String level_filter, int year, int type_id, int page, int limit) { if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份 String bureauIds = zm.getBureauIds(area_id, school_type_id, keyword); - Page list = zm.getQueryYqsb(bureauIds, year, km_code, level_filter, type_id,page, limit); + Page list = zm.getQueryYqsb(bureauIds, year, km_code, level_filter, type_id, page, limit); renderJson(CommonUtil.renderJsonForLayUI(list)); } @@ -543,11 +543,13 @@ public class ZbdcController extends Controller { // http://10.10.21.20:9000/QingLong/zbdc/getQueryXxhsb?area_id=&school_type_id=211&dcb_id=1&year=0&keyword=&page=1&limit=10 // 县区小学 // http://10.10.21.20:9000/QingLong/zbdc/getQueryXxhsb?area_id=2C0CE452-B43C-478E-8D51-F4470A36F739&school_type_id=211&dcb_id=1&year=0&keyword=&page=1&limit=10 - public void getQueryXxhsb(String school_id, String area_id, int school_type_id, String keyword, int year, int dcb_id, int page, int limit) { + public void getQueryXxhsb(String school_id, int type_id, String area_id, int school_type_id, String keyword, int year, int dcb_id, int page, int limit) { if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份 - if (StrKit.isBlank(school_id)) { + if (StrKit.isBlank(school_id) && type_id == 0) { //学校查询自己 school_id = SessionKit.get(getRequest(), getResponse(), "bureau_id"); } + if (StrKit.isBlank(school_id) && type_id == 1) {// 查询所有学校 + } Page list = zm.getQueryXxhsb(school_id, area_id, school_type_id, year, keyword, dcb_id, page, limit); renderJson(CommonUtil.renderJsonForLayUI(list)); } @@ -681,7 +683,7 @@ public class ZbdcController extends Controller { //上报单位ID String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id"); - Page list = zm.listSchool(year,area_id, bureau_id, check_type_id, school_type_id, keyword, page, limit); + Page list = zm.listSchool(year, area_id, bureau_id, check_type_id, school_type_id, keyword, page, limit); renderJson(CommonUtil.renderJsonForLayUI(list)); }