Big-Data-Lab
/
CET-cmd-2.0
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

首页优化

This commit is contained in:
xbx 2024-04-20 20:56:56 +08:00
parent 928fec692c
commit ffdc0848b1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java
View File

@ -223,27 +223,32 @@ public class CenterServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implement
LambdaQueryWrapper<Cet_4> Cet_4QW = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Cet_4> Cet_4QW = new LambdaQueryWrapper<>();
//获取全部在籍学生 //获取全部在籍学生
LambdaQueryWrapper<Cet4_major> Cet4_majorQW = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Cet4_major> Cet4_majorQW = new LambdaQueryWrapper<>();
String totalName = null;
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
Cet_4QW.clear(); // 清空查询条件，以便重新设置 Cet_4QW.clear(); // 清空查询条件，以便重新设置
if (college.equals("全校")) { if (college.equals("全校")) {
totalName = "全校";
Cet_4QW.eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); Cet_4QW.eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i));
//查询该年级的全校在籍学生 //查询该年级的全校在籍学生
Cet4_majorQW.clear(); Cet4_majorQW.clear();
Cet4_majorQW.select(Cet4_major::getId).eq(Cet4_major::getEntrydate, entryDate).eq(Cet4_major::getState,"在校"); Cet4_majorQW.select(Cet4_major::getId).eq(Cet4_major::getEntrydate, entryDate).eq(Cet4_major::getState,"在校");
allStudent = cet4_majorMapper.selectCount(Cet4_majorQW); allStudent = cet4_majorMapper.selectCount(Cet4_majorQW);
} else if (college.equals("专升本")) { } else if (college.equals("专升本")) {
totalName = "全校";
Cet_4QW.eq(Cet_4::getLevel, college).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); Cet_4QW.eq(Cet_4::getLevel, college).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i));
//查询该年级的专升本在籍学生 //查询该年级的专升本在籍学生
Cet4_majorQW.clear(); Cet4_majorQW.clear();
Cet4_majorQW.select(Cet4_major::getId).eq(Cet4_major::getLevel, college).eq(Cet4_major::getState,"在校").eq(Cet4_major::getEntrydate, entryDate); Cet4_majorQW.select(Cet4_major::getId).eq(Cet4_major::getLevel, college).eq(Cet4_major::getState,"在校").eq(Cet4_major::getEntrydate, entryDate);
allStudent = cet4_majorMapper.selectCount(Cet4_majorQW); allStudent = cet4_majorMapper.selectCount(Cet4_majorQW);
} else if (major.equals("")) { } else if (major.equals("")) {
totalName = "学院";
Cet_4QW.eq(Cet_4::getCollege, college).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); Cet_4QW.eq(Cet_4::getCollege, college).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i));
//查询该年级的学院在籍学生 //查询该年级的学院在籍学生
Cet4_majorQW.clear(); Cet4_majorQW.clear();
Cet4_majorQW.select(Cet4_major::getId).eq(Cet4_major::getCollege, college).eq(Cet4_major::getState,"在校").eq(Cet4_major::getEntrydate, entryDate); Cet4_majorQW.select(Cet4_major::getId).eq(Cet4_major::getCollege, college).eq(Cet4_major::getState,"在校").eq(Cet4_major::getEntrydate, entryDate);
allStudent = cet4_majorMapper.selectCount(Cet4_majorQW); allStudent = cet4_majorMapper.selectCount(Cet4_majorQW);
} else { } else {
totalName = "专业";
//查询该年级的学院专业在籍学生 //查询该年级的学院专业在籍学生
Cet_4QW.eq(Cet_4::getCollege, college).eq(Cet_4::getMajorname, major).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); Cet_4QW.eq(Cet_4::getCollege, college).eq(Cet_4::getMajorname, major).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i));
Cet4_majorQW.clear(); Cet4_majorQW.clear();
@ -283,7 +288,7 @@ public class CenterServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implement
} }
//保留三位小数 //保留三位小数
DecimalFormat df = new DecimalFormat("#.###"); DecimalFormat df = new DecimalFormat("#.###");
String[] grade = {"大一", "大二", "大三", "大四"}; String[] grade = {"大一学年", "大二学年", "大三学年", "大四学年"};
JSONObject resultJson = new JSONObject(true); JSONObject resultJson = new JSONObject(true);
//遍历批次分年级 //遍历批次分年级
for (int i = 0; i < n; i += 2) { for (int i = 0; i < n; i += 2) {
@ -316,6 +321,7 @@ public class CenterServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implement
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("cet4", resultJson); result.put("cet4", resultJson);
result.put("total", allStudent);//总人数 result.put("total", allStudent);//总人数
result.put("totalName", totalName);//总人数
result.put("passNumber",passNumber[n - 1]);//累计通过人数 result.put("passNumber",passNumber[n - 1]);//累计通过人数
result.put("passRate", df.format((passNumber[n - 1] / (double) allStudent)));//累计通过率 result.put("passRate", df.format((passNumber[n - 1] / (double) allStudent)));//累计通过率
return Result.ok(result); return Result.ok(result);