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

Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

Browse Source
main
kgdxpr 1 year ago
parent 1abf454ec0 8abe8b78d7
commit 8a16924459
3 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File

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

@ -1784,7 +1784,7 @@ public class ZbdcModel {
bd = bd.setScale(2, RoundingMode.HALF_UP); // 设置小数点后保留两位，并使用四舍五入模式
// 如果需要将格式化后的数值用于数学运算，可以使用doubleValue()等方法
double doubleValue = bd.doubleValue();
sumMap.put(column, sumValue.doubleValue() + doubleValue);
sumMap.put(column, (int) Math.round(sumValue.doubleValue() + doubleValue));
}
}
}
@ -1812,19 +1812,16 @@ public class ZbdcModel {
List<Record> list = Db.find(sqlPara);
for (Record record : list) {
record.set("school_count", record.getInt("se_school_count") +
record.set("school_count",
record.getInt("jn_school_count") +
record.getInt("wq_school_count") +
record.getInt("gz_school_count") +
record.getInt("cz_school_count") +
record.getInt("chengzhen_school_count") +
record.getInt("chunxiao_school_count")
record.getInt("wq_school_count") +
record.getInt("gz_school_count") +
record.getInt("cz_school_count") +
record.getInt("chengzhen_school_count") +
record.getInt("chunxiao_school_count")
);
record.set("student_count",
record.getInt("se_gz_student_count") +
record.getInt("se_cz_student_count") +
record.getInt("se_xx_student_count") +
record.getInt("jn_cz_student_count") +
record.getInt("jn_cz_student_count") +
record.getInt("jn_xx_student_count") +
record.getInt("wq_gz_student_count") +
record.getInt("wq_cz_student_count") +
@ -1834,10 +1831,7 @@ public class ZbdcModel {
record.getInt("chunxiao_student_count")
);
record.set("class_count",
record.getInt("se_gz_class_count") +
record.getInt("se_cz_class_count") +
record.getInt("se_xx_class_count") +
record.getInt("jn_cz_class_count") +
record.getInt("jn_cz_class_count") +
record.getInt("jn_xx_class_count") +
record.getInt("wq_gz_class_count") +
record.getInt("wq_cz_class_count") +
@ -1846,6 +1840,27 @@ public class ZbdcModel {
record.getInt("chengzhen_class_count") +
record.getInt("chunxiao_class_count")
);
record.set("teacher_count",
record.getInt("jn_cz_teacher_count") +
record.getInt("jn_xx_teacher_count") +
record.getInt("wq_gz_teacher_count") +
record.getInt("wq_cz_teacher_count") +
record.getInt("gz_teacher_count") +
record.getInt("cz_teacher_count") +
record.getInt("chengzhen_teacher_count") +
record.getInt("chunxiao_teacher_count")
);
record.set("zhuanren_count",
record.getInt("jn_cz_zhuanren_count") +
record.getInt("jn_xx_zhuanren_count") +
record.getInt("wq_gz_zhuanren_count") +
record.getInt("wq_cz_zhuanren_count") +
record.getInt("gz_zhuanren_count") +
record.getInt("cz_zhuanren_count") +
record.getInt("chengzhen_zhuanren_count") +
record.getInt("chunxiao_zhuanren_count")
);
}
list = expandList(list, year);
addSummaryRow(list);
@ -1924,7 +1939,7 @@ public class ZbdcModel {
if (list.isEmpty()) return null;
//行政区划
List<Record> listXzqh = getQueryXzqh(year,-2);
List<Record> listXzqh = getQueryXzqh(year, -2);
//有用的记录
Record originalRecord = list.getFirst();
// 遍历每个属性，如果不是area_name,那么给初值0
@ -2128,7 +2143,7 @@ public class ZbdcModel {
Map<String, Record> mHlwdk = getMap(listHlwdk);
//行政区划
List<Record> list = getQueryXzqh(year,-2);
List<Record> list = getQueryXzqh(year, -2);
for (Record record : list) {
String area_name = record.getStr("area_name");
if (mJcjh.containsKey(area_name)) {

BIN
src/main/resource/ExcelExportTemplate/exportSummaryBaseInfo.xlsx
View File

Binary file not shown.

30
src/main/resource/Sql/Zbdc.sql
Unescape View File

@ -28,42 +28,50 @@
-- 基础信息统计
#sql("getSummaryBaseInfo")
select area_name,
SUM(CASE WHEN school_type_name='十二年一贯制学校' THEN 1 ELSE 0 END) AS se_school_count,
SUM(CASE WHEN school_type_name='十二年一贯制学校' THEN gz_class_count ELSE 0 END) AS se_gz_class_count,
SUM(CASE WHEN school_type_name='十二年一贯制学校' THEN gz_student_count ELSE 0 END) AS se_gz_student_count,
SUM(CASE WHEN school_type_name='十二年一贯制学校' THEN cz_class_count ELSE 0 END) AS se_cz_class_count,
SUM(CASE WHEN school_type_name='十二年一贯制学校' THEN cz_student_count ELSE 0 END) AS se_cz_student_count,
SUM(CASE WHEN school_type_name='十二年一贯制学校' THEN xx_class_count ELSE 0 END) AS se_xx_class_count,
SUM(CASE WHEN school_type_name='十二年一贯制学校' THEN xx_student_count ELSE 0 END) AS se_xx_student_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN 1 ELSE 0 END) AS jn_school_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN cz_class_count ELSE 0 END) AS jn_cz_class_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN cz_student_count ELSE 0 END) AS jn_cz_student_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN xx_class_count ELSE 0 END) AS jn_xx_class_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN cz_student_count ELSE 0 END) AS jn_cz_student_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN xx_student_count ELSE 0 END) AS jn_xx_student_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN cz_teacher_count ELSE 0 END) AS jn_cz_teacher_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN xx_teacher_count ELSE 0 END) AS jn_xx_teacher_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN cz_zhuanren_count ELSE 0 END) AS jn_cz_zhuanren_count,
SUM(CASE WHEN school_type_name='九年一贯制学校' THEN xx_zhuanren_count ELSE 0 END) AS jn_xx_zhuanren_count,
SUM(CASE WHEN school_type_name='完全中学' THEN 1 ELSE 0 END) AS wq_school_count,
SUM(CASE WHEN school_type_name='完全中学' THEN gz_class_count ELSE 0 END) AS wq_gz_class_count,
SUM(CASE WHEN school_type_name='完全中学' THEN gz_student_count ELSE 0 END) AS wq_gz_student_count,
SUM(CASE WHEN school_type_name='完全中学' THEN cz_class_count ELSE 0 END) AS wq_cz_class_count,
SUM(CASE WHEN school_type_name='完全中学' THEN gz_student_count ELSE 0 END) AS wq_gz_student_count,
SUM(CASE WHEN school_type_name='完全中学' THEN cz_student_count ELSE 0 END) AS wq_cz_student_count,
SUM(CASE WHEN school_type_name='完全中学' THEN gz_teacher_count ELSE 0 END) AS wq_gz_teacher_count,
SUM(CASE WHEN school_type_name='完全中学' THEN cz_teacher_count ELSE 0 END) AS wq_cz_teacher_count,
SUM(CASE WHEN school_type_name='完全中学' THEN gz_zhuanren_count ELSE 0 END) AS wq_gz_zhuanren_count,
SUM(CASE WHEN school_type_name='完全中学' THEN cz_zhuanren_count ELSE 0 END) AS wq_cz_zhuanren_count,
SUM(CASE WHEN school_type_name='高级中学' THEN 1 ELSE 0 END) AS gz_school_count,
SUM(CASE WHEN school_type_name='高级中学' THEN gz_class_count ELSE 0 END) AS gz_class_count,
SUM(CASE WHEN school_type_name='高级中学' THEN gz_student_count ELSE 0 END) AS gz_student_count,
SUM(CASE WHEN school_type_name='高级中学' THEN gz_teacher_count ELSE 0 END) AS gz_teacher_count,
SUM(CASE WHEN school_type_name='高级中学' THEN gz_zhuanren_count ELSE 0 END) AS gz_zhuanren_count,
SUM(CASE WHEN school_type_name='初级中学' THEN 1 ELSE 0 END) AS cz_school_count,
SUM(CASE WHEN school_type_name='初级中学' THEN cz_class_count ELSE 0 END) AS cz_class_count,
SUM(CASE WHEN school_type_name='初级中学' THEN cz_student_count ELSE 0 END) AS cz_student_count,
SUM(CASE WHEN school_type_name='初级中学' THEN cz_teacher_count ELSE 0 END) AS cz_teacher_count,
SUM(CASE WHEN school_type_name='初级中学' THEN cz_zhuanren_count ELSE 0 END) AS cz_zhuanren_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=1 THEN 1 ELSE 0 END) AS chengzhen_school_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=1 THEN xx_class_count ELSE 0 END) AS chengzhen_class_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=1 THEN xx_student_count ELSE 0 END) AS chengzhen_student_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=1 THEN xx_teacher_count ELSE 0 END) AS chengzhen_teacher_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=1 THEN xx_zhuanren_count ELSE 0 END) AS chengzhen_zhuanren_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=2 THEN 1 ELSE 0 END) AS chunxiao_school_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=2 THEN xx_class_count ELSE 0 END) AS chunxiao_class_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=2 THEN xx_student_count ELSE 0 END) AS chunxiao_student_count
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=2 THEN xx_student_count ELSE 0 END) AS chunxiao_student_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=2 THEN xx_teacher_count ELSE 0 END) AS chunxiao_teacher_count,
SUM(CASE WHEN school_type_name='小学' and xiaoxue_type_id=2 THEN xx_zhuanren_count ELSE 0 END) AS chunxiao_zhuanren_count
from t_zbdc_bureau_base where year=#para(year) group by area_id,area_name;
#end

Write Preview
Loading…
Cancel
Save