|
|
|
@ -982,6 +982,7 @@ public class ZbdcModel {
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 功能:增加子分类项目
|
|
|
|
|
*
|
|
|
|
|
* @param dcb_id
|
|
|
|
|
* @param lb_id
|
|
|
|
|
* @param lb_name
|
|
|
|
@ -1371,43 +1372,11 @@ public class ZbdcModel {
|
|
|
|
|
record.set("student_count", record.getInt("xx_student_count") + record.getInt("cz_student_count") + record.getInt("gz_student_count"));
|
|
|
|
|
record.set("teacher_count", record.getInt("xx_teacher_count") + record.getInt("cz_teacher_count") + record.getInt("gz_teacher_count"));
|
|
|
|
|
record.set("class_count", record.getInt("xx_class_count") + record.getInt("cz_class_count") + record.getInt("gz_class_count"));
|
|
|
|
|
record.set("zhuanren_count",record.getInt("xx_zhuanren_count")+record.getInt("cz_zhuanren_count")+record.getInt("gz_zhuanren_count"));
|
|
|
|
|
updateRecord(record);
|
|
|
|
|
record.set("zhuanren_count", record.getInt("xx_zhuanren_count") + record.getInt("cz_zhuanren_count") + record.getInt("gz_zhuanren_count"));
|
|
|
|
|
}
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void updateRecord(Record record) {
|
|
|
|
|
List<String> killList = new ArrayList<>();
|
|
|
|
|
if (record.getStr("school_type_name") == null) return;
|
|
|
|
|
if (record.getStr("school_type_name").equals("小学")) {
|
|
|
|
|
killList.add("cz");
|
|
|
|
|
killList.add("gz");
|
|
|
|
|
killList.add("wl");
|
|
|
|
|
killList.add("sw");
|
|
|
|
|
killList.add("hx");
|
|
|
|
|
}
|
|
|
|
|
if (record.getStr("school_type_name").equals("初级中学")) {
|
|
|
|
|
killList.add("xx");
|
|
|
|
|
killList.add("gz");
|
|
|
|
|
}
|
|
|
|
|
if (record.getStr("school_type_name").equals("高级中学")) {
|
|
|
|
|
killList.add("xx");
|
|
|
|
|
killList.add("cz");
|
|
|
|
|
}
|
|
|
|
|
if (record.getStr("school_type_name").equals("九年一贯制学校")) {
|
|
|
|
|
killList.add("gz");
|
|
|
|
|
}
|
|
|
|
|
if (record.getStr("school_type_name").equals("完全中学")) {
|
|
|
|
|
killList.add("xx");
|
|
|
|
|
}
|
|
|
|
|
for (Map.Entry<String, Object> entry : record.getColumns().entrySet()) {
|
|
|
|
|
String attrName = entry.getKey();
|
|
|
|
|
for (String s : killList) {
|
|
|
|
|
if (attrName.startsWith(s)) record.set(attrName, "--");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 功能:常规装备查询
|
|
|
|
@ -1424,10 +1393,6 @@ public class ZbdcModel {
|
|
|
|
|
} else {
|
|
|
|
|
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (Record record : p.getList()) {
|
|
|
|
|
updateRecord(record);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (school_type_id > 0) {
|
|
|
|
|
String school_type_name = getSchoolTypeName(school_type_id);
|
|
|
|
@ -1435,13 +1400,102 @@ public class ZbdcModel {
|
|
|
|
|
} else {
|
|
|
|
|
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%' order by bureau_id");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (Record record : p.getList()) {
|
|
|
|
|
updateRecord(record);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for (Record record : p.getList()) {
|
|
|
|
|
record.set("area_name", _map.get(record.getStr("bureau_id")).getStr("area_name"));
|
|
|
|
|
//音乐
|
|
|
|
|
record.set("summary_yqjtrshshu", record.getInt("xx_yqjtrshshu") + record.getInt("cz_yqjtrshshu") + record.getInt("gz_yqjtrshshu"));
|
|
|
|
|
record.set("summary_yqjtrmj", record.getFloat("xx_yqjtrmj") + record.getFloat("cz_yqjtrmj") + record.getFloat("gz_yqjtrmj"));
|
|
|
|
|
record.set("summary_yqqjkkjshu", record.getInt("xx_yqqjkkjshu") + record.getInt("cz_yqqjkkjshu") + record.getInt("gz_yqqjkkjshu"));
|
|
|
|
|
record.set("summary_yyyppz", record.getInt("xx_yyyppz") + record.getInt("cz_yyyppz") + record.getInt("gz_yyyppz"));
|
|
|
|
|
record.set("summary_yyypjs", record.getInt("xx_yyypjs") + record.getInt("cz_yyypjs") + record.getInt("gz_yyypjs"));
|
|
|
|
|
//体育
|
|
|
|
|
record.set("summary_tygyshshu", record.getInt("xx_tygyshshu") + record.getInt("cz_tygyshshu") + record.getInt("gz_tygyshshu"));
|
|
|
|
|
record.set("summary_tyqjkkjshu", record.getInt("xx_tyqjkkjshu") + record.getInt("cz_tyqjkkjshu") + record.getInt("gz_tyqjkkjshu"));
|
|
|
|
|
record.set("summary_tyyppz", record.getInt("xx_tyyppz") + record.getInt("cz_tyyppz") + record.getInt("gz_tyyppz"));
|
|
|
|
|
record.set("summary_tyypjs", record.getInt("xx_tyypjs") + record.getInt("cz_tyypjs") + record.getInt("gz_tyypjs"));
|
|
|
|
|
//美术
|
|
|
|
|
record.set("summary_msjtrshshu", record.getInt("xx_msjtrshshu") + record.getInt("cz_msjtrshshu") + record.getInt("gz_msjtrshshu"));
|
|
|
|
|
record.set("summary_msjtrmj", record.getFloat("xx_msjtrmj") + record.getFloat("cz_msjtrmj") + record.getFloat("gz_msjtrmj"));
|
|
|
|
|
record.set("summary_msqjkkjshu", record.getInt("xx_msqjkkjshu") + record.getInt("cz_msqjkkjshu") + record.getInt("gz_msqjkkjshu"));
|
|
|
|
|
record.set("summary_msfsjtrshshu", record.getInt("xx_msfsjtrshshu") + record.getInt("cz_msfsjtrshshu"));
|
|
|
|
|
record.set("summary_msfsjtrmj", record.getFloat("xx_msfsjtrmj") + record.getFloat("cz_msfsjtrmj"));
|
|
|
|
|
record.set("summary_msyppz", record.getInt("xx_msyppz") + record.getInt("cz_msyppz") + record.getInt("gz_msyppz"));
|
|
|
|
|
record.set("summary_msypjs", record.getInt("xx_msypjs") + record.getInt("cz_msypjs") + record.getInt("gz_msypjs"));
|
|
|
|
|
|
|
|
|
|
//物理
|
|
|
|
|
record.set("summary_wllshshshu", record.getInt("cz_wllshshshu") + record.getInt("gz_wllshshshu"));
|
|
|
|
|
record.set("summary_wllsmj", record.getFloat("cz_wllsmj") + record.getFloat("gz_wllsmj"));
|
|
|
|
|
record.set("summary_wllyqshshu", record.getInt("cz_wllyqshshu") + record.getInt("gz_wllyqshshu"));
|
|
|
|
|
record.set("summary_wllyqsmj", record.getFloat("cz_wllyqsmj") + record.getFloat("gz_wllyqsmj"));
|
|
|
|
|
record.set("summary_wllzbrshshu", record.getInt("cz_wllzbrshshu") + record.getInt("gz_wllzbrshshu"));
|
|
|
|
|
record.set("summary_wllzbrsmj", record.getFloat("cz_wllzbrsmj") + record.getFloat("gz_wllzbrsmj"));
|
|
|
|
|
record.set("summary_wlyppz", record.getInt("cz_wlyppz") + record.getInt("gz_wlyppz"));
|
|
|
|
|
record.set("summary_wlypjs", record.getFloat("cz_wlypjs") + record.getFloat("gz_wlypjs"));
|
|
|
|
|
|
|
|
|
|
record.set("summary_wltgsmjmj", record.getFloat("cz_wltgsmjmj") + record.getFloat("gz_wltgsmjmj"));
|
|
|
|
|
record.set("summary_wltgsmjmj", record.getFloat("cz_wltgsmjmj") + record.getFloat("gz_wltgsmjmj"));
|
|
|
|
|
//化学
|
|
|
|
|
record.set("summary_hxlshshshu", record.getInt("cz_hxlshshshu") + record.getInt("gz_hxlshshshu"));
|
|
|
|
|
record.set("summary_hxsysmj", record.getFloat("cz_hxsysmj") + record.getFloat("gz_hxsysmj"));
|
|
|
|
|
record.set("summary_hxyqshshu", record.getInt("cz_hxyqshshu") + record.getInt("gz_hxyqshshu"));
|
|
|
|
|
record.set("summary_hxyqsmj", record.getFloat("cz_hxyqsmj") + record.getFloat("gz_hxyqsmj"));
|
|
|
|
|
record.set("summary_hxzbrshshu", record.getInt("cz_hxzbrshshu") + record.getInt("gz_hxzbrshshu"));
|
|
|
|
|
record.set("summary_hxzbrsmj", record.getFloat("cz_hxzbrsmj") + record.getFloat("gz_hxzbrsmj"));
|
|
|
|
|
record.set("summary_hxtgsmjshshu", record.getInt("cz_hxtgsmjshshu") + record.getInt("gz_hxtgsmjshshu"));
|
|
|
|
|
record.set("summary_hxtgsmjmj", record.getFloat("cz_hxtgsmjmj") + record.getFloat("gz_hxtgsmjmj"));
|
|
|
|
|
record.set("summary_hxyppz", record.getInt("cz_hxyppz") + record.getInt("gz_hxyppz")); //gz_hyypjs cz_hxypjs
|
|
|
|
|
record.set("summary_hxypjs", record.getInt("cz_hxypjs") + record.getInt("gz_hxypjs")); //cz_hxyppz gz_hxyppz
|
|
|
|
|
|
|
|
|
|
//生物
|
|
|
|
|
record.set("summary_swlshshshu", record.getInt("cz_swlshshshu") + record.getInt("gz_swlshshshu"));
|
|
|
|
|
record.set("summary_swlsmj", record.getFloat("cz_swlsmj") + record.getFloat("gz_swlsmj"));
|
|
|
|
|
record.set("summary_swyqshshu", record.getInt("cz_swyqshshu") + record.getInt("gz_swyqshshu"));
|
|
|
|
|
record.set("summary_swyqsmj", record.getFloat("cz_swyqsmj") + record.getFloat("gz_swyqsmj"));
|
|
|
|
|
record.set("summary_swzbrshshu", record.getInt("cz_swzbrshshu") + record.getInt("gz_swzbrshshu"));
|
|
|
|
|
record.set("summary_swzbrsmj", record.getFloat("cz_swzbrsmj") + record.getFloat("gz_swzbrsmj"));
|
|
|
|
|
record.set("summary_swtgsmjshshu", record.getInt("cz_swtgsmjshshu") + record.getInt("gz_swtgsmjshshu"));
|
|
|
|
|
record.set("summary_swtgsmjmj", record.getFloat("cz_swtgsmjmj") + record.getFloat("gz_swtgsmjmj"));
|
|
|
|
|
record.set("summary_swyppz", record.getInt("cz_swyppz") + record.getInt("gz_swyppz"));
|
|
|
|
|
record.set("summary_swypjs", record.getInt("cz_swypjs") + record.getInt("gz_swypjs"));
|
|
|
|
|
|
|
|
|
|
//劳技
|
|
|
|
|
record.set("summary_ldjyqlhwsrshu", record.getInt("xx_ldjyqlhwsrshu") + record.getInt("cz_ldjyqlhwsrshu"));
|
|
|
|
|
record.set("summary_ldjyzyhwsrshu", record.getInt("xx_ldjyzyhwsrshu") + record.getInt("cz_ldjyzyhwsrshu"));
|
|
|
|
|
record.set("summary_ldjyprwywsrshu", record.getInt("xx_ldjyprwywsrshu") + record.getInt("cz_ldjyprwywsrshu"));
|
|
|
|
|
record.set("summary_ldjyjyqyqsyyh", record.getInt("xx_ldjyjyqyqsyyh") + record.getInt("cz_ldjyjyqyqsyyh"));
|
|
|
|
|
record.set("summary_ldjynyscld", record.getInt("xx_ldjynyscld") + record.getInt("cz_ldjynyscld"));
|
|
|
|
|
record.set("summary_ldjyccgyz", record.getInt("xx_ldjyccgyz") + record.getInt("cz_ldjyccgyz"));
|
|
|
|
|
record.set("summary_ldjygyscld", record.getInt("xx_ldjygyscld") + record.getInt("cz_ldjygyscld"));
|
|
|
|
|
record.set("summary_ldjyxjstyyyy", record.getInt("xx_ldjyxjstyyyy") + record.getInt("cz_ldjyxjstyyyy"));
|
|
|
|
|
record.set("summary_ldjyxdfwyld", record.getInt("xx_ldjyxdfwyld") + record.getInt("cz_ldjyxdfwyld"));
|
|
|
|
|
|
|
|
|
|
//图书馆,是小学、初中、高中的三项和,汇总成summary字段
|
|
|
|
|
record.set("summary_tsgcsshshu", record.getInt("xx_tsgcsshshu") + record.getInt("cz_tsgcsshshu") + record.getInt("gz_tsgcsshshu"));
|
|
|
|
|
record.set("summary_tsgcssmj", record.getFloat("xx_tsgcssmj") + record.getFloat("cz_tsgcssmj") + record.getFloat("gz_tsgcssmj"));
|
|
|
|
|
record.set("summary_tsgzjtsjcshu", record.getInt("xx_tsgzjtsjcshu") + record.getInt("cz_tsgzjtsjcshu") + record.getInt("gz_tsgzjtsjcshu"));
|
|
|
|
|
record.set("summary_tsgdztsjcshu", record.getInt("xx_tsgdztsjcshu") + record.getInt("cz_tsgdztsjcshu") + record.getInt("gz_tsgdztsjcshu"));
|
|
|
|
|
record.set("summary_tsglsyysrshu", record.getInt("xx_tsglsyysrshu") + record.getInt("cz_tsglsyysrshu") + record.getInt("gz_tsglsyysrshu"));
|
|
|
|
|
record.set("summary_tsglsyysmj", record.getFloat("xx_tsglsyysmj") + record.getFloat("cz_tsglsyysmj") + record.getFloat("gz_tsglsyysmj"));
|
|
|
|
|
record.set("summary_tsgsyysrshu", record.getInt("xx_tsgsyysrshu") + record.getInt("cz_tsgsyysrshu") + record.getInt("gz_tsgsyysrshu"));
|
|
|
|
|
record.set("summary_tsgsyysmj", record.getFloat("xx_tsgsyysmj") + record.getFloat("cz_tsgsyysmj") + record.getFloat("gz_tsgsyysmj"));
|
|
|
|
|
record.set("summary_tsgdzyysrshu", record.getInt("xx_tsgdzyysrshu") + record.getInt("cz_tsgdzyysrshu") + record.getInt("gz_tsgdzyysrshu"));
|
|
|
|
|
record.set("summary_tsgdzyysmj", record.getFloat("xx_tsgdzyysmj") + record.getFloat("cz_tsgdzyysmj") + record.getFloat("gz_tsgdzyysmj"));
|
|
|
|
|
//心理辅导室
|
|
|
|
|
record.set("summary_xldfshshu", record.getInt("xx_xldfshshu") + record.getInt("cz_xldfshshu") + record.getInt("gz_xldfshshu"));
|
|
|
|
|
record.set("summary_xldfsmj", record.getFloat("xx_xldfsmj") + record.getFloat("cz_xldfsmj") + record.getFloat("gz_xldfsmj"));
|
|
|
|
|
//卫生室
|
|
|
|
|
record.set("summary_wsrshu", record.getInt("xx_wsrshu") + record.getInt("cz_wsrshu") + record.getInt("gz_wsrshu"));
|
|
|
|
|
record.set("summary_wsrmj", record.getFloat("xx_wsrmj") + record.getFloat("cz_wsrmj") + record.getFloat("gz_wsrmj"));
|
|
|
|
|
//护眼灯
|
|
|
|
|
record.set("summary_hjddjzsks", record.getInt("xx_hjddjzsks") + record.getInt("cz_hjddjzsks") + record.getInt("gz_hjddjzsks"));
|
|
|
|
|
record.set("summary_hjddjzgnqshu", record.getInt("xx_hjddjzgnqshu") + record.getInt("cz_hjddjzgnqshu") + record.getInt("gz_hjddjzgnqshu"));
|
|
|
|
|
record.set("summary_hjddwjzgnqshu", record.getInt("xx_hjddwjzgnqshu") + record.getInt("cz_hjddwjzgnqshu") + record.getInt("gz_hjddwjzgnqshu"));
|
|
|
|
|
//其它
|
|
|
|
|
record.set("summary_qdljtrshshu", record.getInt("cz_qdljtrshshu") + record.getInt("gz_qdljtrshshu"));
|
|
|
|
|
record.set("summary_qdljtrmj", record.getFloat("cz_qdljtrmj") + record.getFloat("gz_qdljtrmj"));
|
|
|
|
|
record.set("summary_lsjtrshshu", record.getInt("cz_lsjtrshshu") + record.getInt("gz_lsjtrshshu"));
|
|
|
|
|
record.set("summary_lsjtrmj", record.getFloat("cz_lsjtrmj") + record.getFloat("gz_lsjtrmj"));
|
|
|
|
|
}
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|