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

'commit'

Browse Source
main
黄海 1 year ago
parent 5ab98115be
commit 35aca74915
2 changed files with 68 additions and 43 deletions
Show Stats Download Patch File Download Diff File

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

@ -658,9 +658,14 @@ public class ZbdcController extends Controller {
// http://10.10.21.20:9000/QingLong/zbdc/getQueryBaseInfo?area_id=0&school_type_id=342&keyword=&page=1&limit=100
// 县区小学
// http://10.10.21.20:9000/QingLong/zbdc/getQueryBaseInfo?area_id=2C0CE452-B43C-478E-8D51-F4470A36F739&school_type_id=211&keyword=&page=1&limit=100
public void getQueryBaseInfo(String area_id, int school_type_id, int year, String keyword, int page, int limit, int export_flag) throws URISyntaxException, IOException {
public void getQueryBaseInfo(String area_id, int school_type_id, int year, String keyword, int page, int limit, int export_flag, int for_bureau) throws URISyntaxException, IOException {
if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
Page<Record> list = zm.getQueryBaseInfo(area_id, school_type_id, year, keyword, page, limit);
//当前登录人员的单位ID
String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
if (for_bureau == 0) bureau_id = null;
Page<Record> list = zm.getQueryBaseInfo(area_id, school_type_id, year, keyword, page, limit, bureau_id);
if (export_flag == 0) {
renderJson(CommonUtil.renderJsonForLayUI(list));
@ -687,9 +692,12 @@ public class ZbdcController extends Controller {
// http://10.10.21.20:9000/QingLong/zbdc/getQueryCgzb?area_id=&school_type_id=211&year=0&keyword=&page=1&limit=10
// 县区小学
// http://10.10.21.20:9000/QingLong/zbdc/getQueryCgzb?area_id=2C0CE452-B43C-478E-8D51-F4470A36F739&school_type_id=211&year=0&keyword=&page=1&limit=10
public void getQueryCgzb(String area_id, int school_type_id, String keyword, int year, int page, int limit, int export_flag) throws URISyntaxException, IOException {
public void getQueryCgzb(String area_id, int school_type_id, String keyword, int year, int page, int limit, int export_flag, int for_bureau) throws URISyntaxException, IOException {
if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
Page<Record> list = zm.getQueryCgzb(area_id, school_type_id, year, keyword, page, limit);
//当前登录人员的单位ID
String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
if (for_bureau == 0) bureau_id = null;
Page<Record> list = zm.getQueryCgzb(area_id, school_type_id, year, keyword, page, limit, bureau_id);
if (export_flag == 0) {
renderJson(CommonUtil.renderJsonForLayUI(list));
} else {
@ -718,9 +726,13 @@ 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 pbyq, int page, int limit, int export_flag) throws URISyntaxException, IOException {
public void getQueryYqsb(String area_id, int school_type_id, String keyword, String km_code, String level_filter, int year, int type_id, int pbyq, int page, int limit, int export_flag, int for_bureau) throws URISyntaxException, IOException {
if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
String bureauIds = zm.getBureauIds(area_id, school_type_id, keyword);
//当前登录人员的单位ID
String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
if (for_bureau == 1) bureauIds = bureau_id;
Page<Record> list = zm.getQueryYqsb(bureauIds, year, km_code, level_filter, type_id, pbyq, page, limit);
if (export_flag == 0) {
renderJson(CommonUtil.renderJsonForLayUI(list));
@ -756,8 +768,14 @@ 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, int export_flag) throws URISyntaxException, IOException {
public void getQueryXxhsb(String school_id, String area_id, int school_type_id, String keyword, int year, int dcb_id, int page, int limit, int export_flag, int for_bureau) throws URISyntaxException, IOException {
if (year == 0) year = DateTime.now().year();//如果没有传入获取的年份，那么就是系统的默认当前年份
//当前登录人员的单位ID
String bureau_id = SessionKit.get(getRequest(), getResponse(), "bureau_id");
if (for_bureau == 1) {
school_id = bureau_id;
}
Page<Record> list = zm.getQueryXxhsb(school_id, area_id, school_type_id, year, keyword, dcb_id, page, limit);
if (export_flag == 0) {
renderJson(CommonUtil.renderJsonForLayUI(list));
@ -769,7 +787,6 @@ public class ZbdcController extends Controller {
ExcelExportUtil.exportByTemplate(list.getList(), template, excelFile);
renderFile(new File(excelFile), "信息化设备.xlsx");
}
}
/**

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

@ -1414,7 +1414,7 @@ public class ZbdcModel {
/**
* 功能：查询基础信息
*/
public Page<Record> getQueryBaseInfo(String area_id, int school_type_id, int year, String keyword, int page, int limit) {
public Page<Record> getQueryBaseInfo(String area_id, int school_type_id, int year, String keyword, int page, int limit, String bureau_id) {
if (StrKit.isBlank(keyword)) keyword = "";
Page<Record> p;
/**
@ -1423,28 +1423,32 @@ public class ZbdcModel {
* -1：全部
* 其它：学校类型
*/
if (!StrKit.isBlank(area_id)) {//市直或指定区域
//指定区域
String bureauIds;
if (area_id.equals("0")) {
bureauIds = getShiZhiBureauIds(school_type_id, keyword);
} else { //不是市直属，而是某个区县
bureauIds = getBureauIds(area_id, school_type_id, keyword);
}
if (StrKit.isBlank(bureauIds)) bureauIds = "'-1'";
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where bureau_id in (" + bureauIds + ") and year=" + year + " order by area_name");
} else {//全部
if (school_type_id == -1) {
if (StrKit.isBlank(area_id)) {
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' order by area_name");
} else {
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and area_id='" + area_id + "' order by area_name");
if (StrKit.isBlank(bureau_id)) { //如果不是查找指定单位的情况下
if (!StrKit.isBlank(area_id)) {//市直或指定区域
//指定区域
String bureauIds;
if (area_id.equals("0")) {
bureauIds = getShiZhiBureauIds(school_type_id, keyword);
} else { //不是市直属，而是某个区县
bureauIds = getBureauIds(area_id, school_type_id, keyword);
}
if (StrKit.isBlank(bureauIds)) bureauIds = "'-1'";
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where bureau_id in (" + bureauIds + ") and year=" + year + " order by area_name");
} else {//全部
if (school_type_id == -1) {
if (StrKit.isBlank(area_id)) {
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' order by area_name");
} else {
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and area_id='" + area_id + "' order by area_name");
}
} else {
String school_type_name = getSchoolTypeName(school_type_id);
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and area_id='" + area_id + "'and school_type_name='" + school_type_name + "' order by area_name");
} else {
String school_type_name = getSchoolTypeName(school_type_id);
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where year=" + year + " and bureau_name like '%" + keyword + "%' and area_id='" + area_id + "'and school_type_name='" + school_type_name + "' order by area_name");
}
}
} else {//指定具体单位ID
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_base where bureau_id ='" + bureau_id + "' and year=" + year);
}
for (Record record : p.getList()) {
@ -1460,33 +1464,37 @@ public class ZbdcModel {
/**
* 功能：常规装备查询
*/
public Page<Record> getQueryCgzb(String area_id, int school_type_id, int year, String keyword, int page, int limit) {
public Page<Record> getQueryCgzb(String area_id, int school_type_id, int year, String keyword, int page, int limit, String bureau_id) {
if (StrKit.isBlank(keyword)) keyword = "";
Page<Record> p;
Map<String, Record> _map = getSchoolAreaName();
if (!StrKit.isBlank(area_id)) {
String bureauIds = getBureauIds(area_id, school_type_id, keyword);
if (StrKit.isBlank(bureauIds)) {
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where 1=2");
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 *", "from t_zbdc_bureau_cgzb where 1=2");
} else {
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
}
} else {
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where bureau_id in (" + bureauIds + ") and year=" + year + " order by bureau_id");
if (school_type_id > 0) {
String school_type_name = getSchoolTypeName(school_type_id);
p = Db.paginate(page, limit, "select *", "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 *", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%' order by bureau_id");
}
}
} else {
if (school_type_id > 0) {
String school_type_name = getSchoolTypeName(school_type_id);
p = Db.paginate(page, limit, "select *", "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 *", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_name like '%" + keyword + "%' order by bureau_id");
}
p = Db.paginate(page, limit, "select *", "from t_zbdc_bureau_cgzb where year=" + year + " and bureau_id='" + bureau_id + "'");
}
//配备情况
List<Record> listPb = calcPbl(year);
Map<String, Float> mapPbl = new HashMap<>();//配备率
Map<String, Integer> mapNowCnt = new HashMap<>();//现有品种数量
Map<String, Integer> mapNeedCnt = new HashMap<>();//应配置品种数量
for (Record record : listPb) {
String bureau_id = record.getStr("bureau_id");
bureau_id = record.getStr("bureau_id");
String col = record.getStr("col"); //summary_yypbl
float radio = record.getFloat("radio");
int nowcnt = record.getInt("nowcnt");
@ -1500,7 +1508,7 @@ public class ZbdcModel {
}
for (Record record : p.getList()) {
String bureau_id = record.getStr("bureau_id");
bureau_id = record.getStr("bureau_id");
record.set("area_name", _map.get(bureau_id).getStr("area_name"));
//音乐
record.set("summary_yqjtrshshu", record.getInt("xx_yqjtrshshu") + record.getInt("cz_yqjtrshshu") + record.getInt("gz_yqjtrshshu"));
@ -1811,7 +1819,7 @@ public class ZbdcModel {
*/
public List<JSONObject> getSummaryCgzb(int year) {
//基于常规装备查询功能构建统计功能
Page<Record> list = getQueryCgzb(null, 0, year, "", 1, 9999);
Page<Record> list = getQueryCgzb(null, 0, year, "", 1, 9999,null);
String json = JsonKit.toJson(list.getList());
JSONArray ja = JSONArray.parseArray(json);
Map<String, JSONObject> map = new HashMap<>();

Write Preview
Loading…
Cancel
Save