From ffdc0848b1a348a109de0564cd8c5b27ba314900 Mon Sep 17 00:00:00 2001 From: xbx <1827135378@qq.com> Date: Sat, 20 Apr 2024 20:56:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/service/impl/CenterServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java index 2ff805cb..d3641b06 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CenterServiceImpl.java @@ -223,27 +223,32 @@ public class CenterServiceImpl extends ServiceImpl implement LambdaQueryWrapper Cet_4QW = new LambdaQueryWrapper<>(); //获取全部在籍学生 LambdaQueryWrapper Cet4_majorQW = new LambdaQueryWrapper<>(); + String totalName = null; for (int i = 0; i < n; i++) { Cet_4QW.clear(); // 清空查询条件，以便重新设置 if (college.equals("全校")) { + totalName = "全校"; Cet_4QW.eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); //查询该年级的全校在籍学生 Cet4_majorQW.clear(); Cet4_majorQW.select(Cet4_major::getId).eq(Cet4_major::getEntrydate, entryDate).eq(Cet4_major::getState,"在校"); allStudent = cet4_majorMapper.selectCount(Cet4_majorQW); } else if (college.equals("专升本")) { + totalName = "全校"; Cet_4QW.eq(Cet_4::getLevel, college).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); //查询该年级的专升本在籍学生 Cet4_majorQW.clear(); 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); } else if (major.equals("")) { + totalName = "学院"; Cet_4QW.eq(Cet_4::getCollege, college).eq(Cet_4::getEntrydate, entryDate).eq(Cet_4::getBatch, batchList.get(i)); //查询该年级的学院在籍学生 Cet4_majorQW.clear(); 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); } 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)); Cet4_majorQW.clear(); @@ -283,7 +288,7 @@ public class CenterServiceImpl extends ServiceImpl implement } //保留三位小数 DecimalFormat df = new DecimalFormat("#.###"); - String[] grade = {"大一", "大二", "大三", "大四"}; + String[] grade = {"大一学年", "大二学年", "大三学年", "大四学年"}; JSONObject resultJson = new JSONObject(true); //遍历批次分年级 for (int i = 0; i < n; i += 2) { @@ -316,6 +321,7 @@ public class CenterServiceImpl extends ServiceImpl implement JSONObject result = new JSONObject(); result.put("cet4", resultJson); result.put("total", allStudent);//总人数 + result.put("totalName", totalName);//总人数 result.put("passNumber",passNumber[n - 1]);//累计通过人数 result.put("passRate", df.format((passNumber[n - 1] / (double) allStudent)));//累计通过率 return Result.ok(result);