huanghai
/
QingLong
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
黄海 1 year ago
parent 1482b99fc2
commit cc32b9badf
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File

41
src/main/java/com/dsideal/QingLong/Zbdc/Controller/ZbdcController.java
Unescape View File

@ -303,7 +303,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(xx_kx)) { if (!StrKit.isBlank(xx_kx)) {
//小学科学 //小学科学
xx_kx = Base64.decodeStr(xx_kx).replace("\n", ""); xx_kx = Base64.decodeStr(xx_kx).replace("\n", "");
Record res = zm.JxSave("xx_kx",xx_kx, year, bureau_id); Record res = zm.JxSave("xx_kx", xx_kx, year, bureau_id);
xx_kxsysshshu = res.getInt("sysshshu"); xx_kxsysshshu = res.getInt("sysshshu");
xx_kxqqrshshu = res.getInt("qqrshshu"); xx_kxqqrshshu = res.getInt("qqrshshu");
xx_kxzbrshshu = res.getInt("zbrshshu"); xx_kxzbrshshu = res.getInt("zbrshshu");
@ -317,7 +317,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(xx_yq)) { if (!StrKit.isBlank(xx_yq)) {
// 小学音乐 // 小学音乐
xx_yq = Base64.decodeStr(xx_yq).replace("\n", ""); xx_yq = Base64.decodeStr(xx_yq).replace("\n", "");
Record res = zm.JxSave("xx_yq",xx_yq, year, bureau_id); Record res = zm.JxSave("xx_yq", xx_yq, year, bureau_id);
xx_yqjtrshshu = res.getInt("jtrshu"); xx_yqjtrshshu = res.getInt("jtrshu");
xx_yqjtrmj = res.getFloat("jtrmj"); xx_yqjtrmj = res.getFloat("jtrmj");
} }
@ -327,7 +327,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(xx_ms)) { if (!StrKit.isBlank(xx_ms)) {
//小学美术 //小学美术
xx_ms = Base64.decodeStr(xx_ms).replace("\n", ""); xx_ms = Base64.decodeStr(xx_ms).replace("\n", "");
Record res = zm.JxSave("xx_ms",xx_ms, year, bureau_id); Record res = zm.JxSave("xx_ms", xx_ms, year, bureau_id);
xx_msjtrshshu = res.getInt("jtrshu"); xx_msjtrshshu = res.getInt("jtrshu");
xx_msfsjtrshshu = res.getInt("fsjtrshu"); //普通教室，书法教室 xx_msfsjtrshshu = res.getInt("fsjtrshu"); //普通教室，书法教室
xx_msjtrmj = res.getFloat("jtrmj"); xx_msjtrmj = res.getFloat("jtrmj");
@ -341,7 +341,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(cz_wl)) { if (!StrKit.isBlank(cz_wl)) {
//初中物理 //初中物理
cz_wl = Base64.decodeStr(cz_wl).replace("\n", ""); cz_wl = Base64.decodeStr(cz_wl).replace("\n", "");
Record res = zm.JxSave("cz_wl",cz_wl, year, bureau_id); Record res = zm.JxSave("cz_wl", cz_wl, year, bureau_id);
cz_wllshshshu = res.getInt("sysshshu"); cz_wllshshshu = res.getInt("sysshshu");
cz_wllyqshshu = res.getInt("qqrshshu"); cz_wllyqshshu = res.getInt("qqrshshu");
cz_wllzbrshshu = res.getInt("zbrshshu"); cz_wllzbrshshu = res.getInt("zbrshshu");
@ -359,7 +359,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(cz_hx)) { if (!StrKit.isBlank(cz_hx)) {
//初中化学 //初中化学
cz_hx = Base64.decodeStr(cz_hx).replace("\n", ""); cz_hx = Base64.decodeStr(cz_hx).replace("\n", "");
Record res = zm.JxSave("cz_hx",cz_hx, year, bureau_id); Record res = zm.JxSave("cz_hx", cz_hx, year, bureau_id);
cz_hxlshshshu = res.getInt("sysshshu"); cz_hxlshshshu = res.getInt("sysshshu");
cz_hxyqshshu = res.getInt("qqrshshu"); cz_hxyqshshu = res.getInt("qqrshshu");
cz_hxzbrshshu = res.getInt("zbrshshu"); cz_hxzbrshshu = res.getInt("zbrshshu");
@ -377,7 +377,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(cz_sw)) { if (!StrKit.isBlank(cz_sw)) {
//初中生物 //初中生物
cz_sw = Base64.decodeStr(cz_sw).replace("\n", ""); cz_sw = Base64.decodeStr(cz_sw).replace("\n", "");
Record res = zm.JxSave("cz_sw",cz_sw, year, bureau_id); Record res = zm.JxSave("cz_sw", cz_sw, year, bureau_id);
cz_swlshshshu = res.getInt("sysshshu"); cz_swlshshshu = res.getInt("sysshshu");
cz_swyqshshu = res.getInt("qqrshshu"); cz_swyqshshu = res.getInt("qqrshshu");
cz_swzbrshshu = res.getInt("zbrshshu"); cz_swzbrshshu = res.getInt("zbrshshu");
@ -393,7 +393,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(cz_yq)) { if (!StrKit.isBlank(cz_yq)) {
//初中音乐 //初中音乐
cz_yq = Base64.decodeStr(cz_yq).replace("\n", ""); cz_yq = Base64.decodeStr(cz_yq).replace("\n", "");
Record res = zm.JxSave("cz_yq",cz_yq, year, bureau_id); Record res = zm.JxSave("cz_yq", cz_yq, year, bureau_id);
cz_yqjtrshshu = res.getInt("jtrshu"); cz_yqjtrshshu = res.getInt("jtrshu");
cz_yqjtrmj = res.getFloat("jtrmj"); cz_yqjtrmj = res.getFloat("jtrmj");
} }
@ -403,7 +403,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(cz_ms)) { if (!StrKit.isBlank(cz_ms)) {
//初中美术 //初中美术
cz_ms = Base64.decodeStr(cz_ms).replace("\n", ""); cz_ms = Base64.decodeStr(cz_ms).replace("\n", "");
Record res = zm.JxSave("cz_ms",cz_ms, year, bureau_id); Record res = zm.JxSave("cz_ms", cz_ms, year, bureau_id);
cz_msjtrshshu = res.getInt("jtrshu"); cz_msjtrshshu = res.getInt("jtrshu");
cz_msfsjtrshshu = res.getInt("fsjtrshu"); //普通教室数量，书法教室数量 cz_msfsjtrshshu = res.getInt("fsjtrshu"); //普通教室数量，书法教室数量
cz_msfsjtrmj = res.getFloat("jtrmj"); cz_msfsjtrmj = res.getFloat("jtrmj");
@ -418,7 +418,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(gz_wl)) { if (!StrKit.isBlank(gz_wl)) {
//高中物理 //高中物理
gz_wl = Base64.decodeStr(gz_wl).replace("\n", ""); gz_wl = Base64.decodeStr(gz_wl).replace("\n", "");
Record res = zm.JxSave("gz_wl",gz_wl, year, bureau_id); Record res = zm.JxSave("gz_wl", gz_wl, year, bureau_id);
gz_wllshshshu = res.getInt("sysshshu"); gz_wllshshshu = res.getInt("sysshshu");
gz_wllyqshshu = res.getInt("qqrshshu"); gz_wllyqshshu = res.getInt("qqrshshu");
gz_wllzbrshshu = res.getInt("zbrshshu"); gz_wllzbrshshu = res.getInt("zbrshshu");
@ -437,7 +437,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(gz_hx)) { if (!StrKit.isBlank(gz_hx)) {
//高中化学 //高中化学
gz_hx = Base64.decodeStr(gz_hx).replace("\n", ""); gz_hx = Base64.decodeStr(gz_hx).replace("\n", "");
Record res = zm.JxSave("gz_hx",gz_hx, year, bureau_id); Record res = zm.JxSave("gz_hx", gz_hx, year, bureau_id);
gz_hxlshshshu = res.getInt("sysshshu"); gz_hxlshshshu = res.getInt("sysshshu");
gz_hxyqshshu = res.getInt("qqrshshu"); gz_hxyqshshu = res.getInt("qqrshshu");
gz_hxzbrshshu = res.getInt("zbrshshu"); gz_hxzbrshshu = res.getInt("zbrshshu");
@ -456,7 +456,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(gz_sw)) { if (!StrKit.isBlank(gz_sw)) {
//高中生物 //高中生物
gz_sw = Base64.decodeStr(gz_sw).replace("\n", ""); gz_sw = Base64.decodeStr(gz_sw).replace("\n", "");
Record res = zm.JxSave("gz_sw",gz_sw, year, bureau_id); Record res = zm.JxSave("gz_sw", gz_sw, year, bureau_id);
gz_swlshshshu = res.getInt("sysshshu"); gz_swlshshshu = res.getInt("sysshshu");
gz_swyqshshu = res.getInt("qqrshshu"); gz_swyqshshu = res.getInt("qqrshshu");
gz_swzbrshshu = res.getInt("zbrshshu"); gz_swzbrshshu = res.getInt("zbrshshu");
@ -472,7 +472,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(gz_yq)) { if (!StrKit.isBlank(gz_yq)) {
//高中音乐 //高中音乐
gz_yq = Base64.decodeStr(gz_yq).replace("\n", ""); gz_yq = Base64.decodeStr(gz_yq).replace("\n", "");
Record res = zm.JxSave("gz_yq",gz_yq, year, bureau_id); Record res = zm.JxSave("gz_yq", gz_yq, year, bureau_id);
gz_yqjtrshshu = res.getInt("jtrshu"); gz_yqjtrshshu = res.getInt("jtrshu");
gz_yqjtrmj = res.getFloat("jtrmj"); gz_yqjtrmj = res.getFloat("jtrmj");
} }
@ -483,7 +483,7 @@ public class ZbdcController extends Controller {
if (!StrKit.isBlank(gz_ms)) { if (!StrKit.isBlank(gz_ms)) {
//高中美术 //高中美术
gz_ms = Base64.decodeStr(gz_ms).replace("\n", ""); gz_ms = Base64.decodeStr(gz_ms).replace("\n", "");
Record res = zm.JxSave("gz_ms",gz_ms, year, bureau_id); Record res = zm.JxSave("gz_ms", gz_ms, year, bureau_id);
gz_msjtrshshu = res.getInt("jtrshu"); gz_msjtrshshu = res.getInt("jtrshu");
gz_msjtrmj = res.getFloat("fsjtrmj");//普通教室面积，书法教室面积 gz_msjtrmj = res.getFloat("fsjtrmj");//普通教室面积，书法教室面积
} }
@ -491,28 +491,28 @@ public class ZbdcController extends Controller {
// 小学劳动教育 // 小学劳动教育
if (!StrKit.isBlank(xx_ldjy)) { if (!StrKit.isBlank(xx_ldjy)) {
xx_ldjy = Base64.decodeStr(xx_ldjy).replace("\n", ""); xx_ldjy = Base64.decodeStr(xx_ldjy).replace("\n", "");
zm.LdjySave("xx_ldjy",xx_ldjy, year, bureau_id); zm.LdjySave("xx_ldjy", xx_ldjy, year, bureau_id);
} }
// 初中劳动教育 // 初中劳动教育
if (!StrKit.isBlank(cz_ldjy)) { if (!StrKit.isBlank(cz_ldjy)) {
cz_ldjy = Base64.decodeStr(cz_ldjy).replace("\n", ""); cz_ldjy = Base64.decodeStr(cz_ldjy).replace("\n", "");
zm.LdjySave("cz_ldjy",cz_ldjy, year, bureau_id); zm.LdjySave("cz_ldjy", cz_ldjy, year, bureau_id);
} }
//小学创客 //小学创客
if (!StrKit.isBlank(xx_ck)) { if (!StrKit.isBlank(xx_ck)) {
xx_ck = Base64.decodeStr(xx_ck).replace("\n", ""); xx_ck = Base64.decodeStr(xx_ck).replace("\n", "");
zm.JxSave("xx_ck",xx_ck, year, bureau_id); zm.JxSave("xx_ck", xx_ck, year, bureau_id);
} }
//初中创客 //初中创客
if (!StrKit.isBlank(cz_ck)) { if (!StrKit.isBlank(cz_ck)) {
cz_ck = Base64.decodeStr(cz_ck).replace("\n", ""); cz_ck = Base64.decodeStr(cz_ck).replace("\n", "");
zm.JxSave("cz_ck",cz_ck, year, bureau_id); zm.JxSave("cz_ck", cz_ck, year, bureau_id);
} }
//高中创客 //高中创客
if (!StrKit.isBlank(gz_ck)) { if (!StrKit.isBlank(gz_ck)) {
gz_ck = Base64.decodeStr(gz_ck).replace("\n", ""); gz_ck = Base64.decodeStr(gz_ck).replace("\n", "");
zm.JxSave("gz_ck",gz_ck, year, bureau_id); zm.JxSave("gz_ck", gz_ck, year, bureau_id);
} }
zm.saveCgzb(year, stage_id, bureau_id, bureau_name, school_type_name, xx_kxsysshshu, zm.saveCgzb(year, stage_id, bureau_id, bureau_name, school_type_name, xx_kxsysshshu,
@ -1112,8 +1112,11 @@ public class ZbdcController extends Controller {
if (StrKit.isBlank(keyword)) keyword = ""; if (StrKit.isBlank(keyword)) keyword = "";
//上报单位ID //上报单位ID
String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id"); String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
BaseModel bm = new BaseModel();
Record orgBean = bm.getOrgInfoById(bureau_id);
String city_id = orgBean.getStr("city_id");
Page<Record> list = zm.listSchool(year, area_id, check_type_id, bureau_id, school_type_id, keyword, page, limit); Page<Record> list = zm.listSchool(city_id,year, area_id, check_type_id, bureau_id, school_type_id, keyword, page, limit);
renderJson(CommonUtil.renderJsonForLayUI(list)); renderJson(CommonUtil.renderJsonForLayUI(list));
} }

13
src/main/java/com/dsideal/QingLong/Zbdc/Model/ZbdcModel.java
Unescape View File

@ -2368,17 +2368,17 @@ public class ZbdcModel {
* @param limit * @param limit
* @check_type_id int 0:待上报,1:已通过 2:待审核， -1:已退回,3:退回已提交,-2:全部 * @check_type_id int 0:待上报,1:已通过 2:待审核， -1:已退回,3:退回已提交,-2:全部
*/ */
public Page<Record> listSchool(int year, String area_id, int check_type_id, String bureau_id, int school_type_id, String keyword, int page, int limit) { public Page<Record> listSchool(String city_id,int year, String area_id, int check_type_id, String bureau_id, int school_type_id, String keyword, int page, int limit) {
String Conditions = ""; String Conditions = "";
if (check_type_id != -2) { if (check_type_id != -2) {
if (check_type_id != 0) { if (check_type_id != 0) {
if (check_type_id != 3) { if (check_type_id != 3) {
Conditions = " and org_id in (select bureau_id from t_zbdc_report where b_use=1 and year=" + year + " and check_type_id=" + check_type_id + ")"; Conditions = " and org_id in (select bureau_id from t_zbdc_report where b_use=1 and year=" + year + " and check_type_id=" + check_type_id + ") and city_id='"+city_id+"'";
} else {//退回已提交 } else {//退回已提交
Conditions = " and org_id in (select bureau_id from t_zbdc_report where b_use=1 and year=" + year + " and check_type_id=2 and is_tuihui_commit=1)"; Conditions = " and org_id in (select bureau_id from t_zbdc_report where b_use=1 and year=" + year + " and check_type_id=2 and is_tuihui_commit=1) and city_id='"+city_id+"'";
} }
} else { } else {
Conditions = " and org_id not in (select bureau_id from t_zbdc_report where b_use=1 and year=" + year + ")"; Conditions = " and org_id not in (select bureau_id from t_zbdc_report where b_use=1 and year=" + year + ") and city_id='"+city_id+"'";
} }
} }
@ -2386,12 +2386,12 @@ public class ZbdcModel {
String sql; String sql;
if (bureau_id.equals(PropKit.get("ZhuangBeiCenterId"))) { if (bureau_id.equals(PropKit.get("ZhuangBeiCenterId"))) {
if (StrKit.isBlank(area_id) || area_id.equals("0")) { if (StrKit.isBlank(area_id) || area_id.equals("0")) {
sql = "from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.org_id=t1.bureau_id and t1.org_type_id=9 and t1.org_name like '%" + keyword + "%' "; sql = "from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.city_id='"+city_id+"' and t1.org_id=t1.bureau_id and t1.org_type_id=9 and t1.org_name like '%" + keyword + "%' ";
if (school_type_id > 0) sql += " and t1.school_type_id=" + school_type_id; if (school_type_id > 0) sql += " and t1.school_type_id=" + school_type_id;
sql += Conditions; sql += Conditions;
} else { } else {
// 市查指定区县的 // 市查指定区县的
sql = "from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.org_id=t1.bureau_id and t1.org_type_id=16 and t1.area_id='" + area_id + sql = "from t_base_organization as t1 inner join t_dm_schooltype as t2 on t1.school_type_id=t2.school_type_id where t1.city_id='"+city_id+"' and t1.org_id=t1.bureau_id and t1.org_type_id=16 and t1.area_id='" + area_id +
"' and t1.org_name like '%" + keyword + "%' "; "' and t1.org_name like '%" + keyword + "%' ";
if (school_type_id > 0) if (school_type_id > 0)
sql += "and t1.school_type_id=" + school_type_id; sql += "and t1.school_type_id=" + school_type_id;
@ -2409,6 +2409,7 @@ public class ZbdcModel {
sql += "and t1.school_type_id=" + school_type_id; sql += "and t1.school_type_id=" + school_type_id;
sql += Conditions; sql += Conditions;
} }
System.out.println("======sql:==="+"select t1.*,t2.school_type_name "+sql);
Page<Record> p = Db.paginate(page, limit, "select t1.*,t2.school_type_name ", sql); Page<Record> p = Db.paginate(page, limit, "select t1.*,t2.school_type_name ", sql);
//是不是已提交 //是不是已提交

Write Preview
Loading…
Cancel
Save