kgdxpr 1 year ago
commit 53318c8627

@ -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<Record> list = zm.getQueryYqsb(bureauIds, year, km_code, level_filter, type_id,page, limit);
Page<Record> 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<Record> 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<Record> list = zm.listSchool(year,area_id, bureau_id, check_type_id, school_type_id, keyword, page, limit);
Page<Record> list = zm.listSchool(year, area_id, bureau_id, check_type_id, school_type_id, keyword, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(list));
}

@ -439,6 +439,9 @@ public class ZbdcModel {
} else {
sql = sql.replace("$bureau_ids$", "''");
}
sql=sql.replace("${km_code}$",km_code);
List<Record> listCross = Db.find(sql);
for (Record cross : listCross) {
@ -487,7 +490,7 @@ public class ZbdcModel {
it.remove(); // 从迭代器中删除不符合条件的记录
}
}
}
}
Page<Record> 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<String, String> _mapSchoolName = getSchoolNameMap();
Map<String, String> _mapSchoolTypeName = getSchoolTypeNameMap();
Page<Record> 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<Record> p = Db.paginate(page, limit, "select t1.*,t2.lb_name,t2.lb_sb_name ", sql);
Map<String, Record> _map = getSchoolAreaName();
for (Record record : p.getList()) {
record.set("bureau_name", _mapSchoolName.get(record.getStr("school_id")));

@ -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")

Loading…
Cancel
Save