From b0a8de4b3ba22c5e20acf86d59bc00b6258ba3d1 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Wed, 23 Oct 2024 18:18:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?getRateByBatch=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/Cet_4ServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java index ad05f97c..94fd658e 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java @@ -117,17 +117,17 @@ public class Cet_4ServiceImpl extends ServiceImpl implements //根据批次查人数 queryWrapper.ge(Cet_4::getResult, 425); - List result = cet4Mapper.selectList(queryWrapper); - collect = result.stream().collect(Collectors.groupingBy(Cet_4::getCollege)); + List passedList = cet4Mapper.selectList(queryWrapper); + passedList = passedList.stream().filter(e -> trueEntryDate.contains(e.getEntrydate())).collect(Collectors.toList()); + if(college.equals("全校")){ + collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getCollege)); + }else{ + collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getMajorname)); + } // 过滤除去错误的数据 allStudentList = allStudentList.stream().filter(e -> trueEntryDate.contains(e.getEntrydate())).collect(Collectors.toList()); long allStudent = allStudentList.size(); - //获取通过人数 - LambdaQueryWrapper passWrapper = new LambdaQueryWrapper<>(); - passWrapper.eq(Cet_4::getBatch, batch).ge(Cet_4::getResult, 425).eq(!college.equals("全校"), Cet_4::getCollege, college); - List passedList = list(passWrapper); - passedList = passedList.stream().filter(e -> trueEntryDate.contains(e.getEntrydate())).collect(Collectors.toList()); long passStudent = passedList.size(); double passRateSum = (passStudent / (double) allStudent) * 100; @@ -558,7 +558,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements public Result getRateByMajorAndLastestBatch(getRateByMajorAndLastestBatchDto getRateByMajorAndLastestBatchParam) { Date batch = cet4Mapper.lastestDate(); JSONObject json = new JSONObject(); - json.put("data",getGradeByBatch(batch,getRateByMajorAndLastestBatchParam.getCollege(),getRateByMajorAndLastestBatchParam.getMajor())); + json.put("data", getGradeByBatch(batch, getRateByMajorAndLastestBatchParam.getCollege(), getRateByMajorAndLastestBatchParam.getMajor())); return Result.ok(json); } From 2ad30ffc4d23c578dfd035415f4947bcd8d9aa02 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Wed, 4 Dec 2024 19:48:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?getData=E6=B7=BB=E5=8A=A0=E5=85=A8=E6=A0=A1?= =?UTF-8?q?=EF=BC=88=E4=B8=8D=E5=90=AB=E8=89=BA=E4=BD=93=E7=BE=8E=E5=A4=96?= =?UTF-8?q?=E8=AF=AD=EF=BC=89=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/CenterServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 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 dc6b5ada..5fe80ba5 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 @@ -262,7 +262,18 @@ public class CenterServiceImpl extends ServiceImpl implement Cet4_majorQW.clear(); Cet4_majorQW.select(Cet4_major::getCode).eq(Cet4_major::getEntrydate, entryDate).eq(Cet4_major::getState, "在校"); allStudent = cet4_majorMapper.selectCount(Cet4_majorQW); - } else if (college.equals("专升本")) { + }else if(college.equals("全校（不含艺体美外语）")) { + totalName = "全校"; + Cet_4QW.eq(Cet_4::getEntrydate, entryDate) + .eq(Cet_4::getBatch, batchList.get(i)) + .eq(Cet_4::getState, "在校"); + Cet_4QW.notIn(Cet_4::getCollege, Arrays.asList("体育科学学院", "美术学院", "音乐学院")); + Cet_4QW.notIn(Cet_4::getMajorname, Arrays.asList("英语","翻译", "商务英语", "表演","广播电视编导", "录音艺术", "播音与主持艺术","动画", "摄影", "数字媒体艺术")); + Cet4_majorQW.clear(); + Cet4_majorQW.select(Cet4_major::getCode).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)); //查询该年级的专升本在籍学生 From 5c19ee200d0966896a415215c6595cc115beb328 Mon Sep 17 00:00:00 2001 From: Xubx <1827135378@qq.com> Date: Thu, 5 Dec 2024 13:43:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/service/impl/Cet_4ServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java index 8847edb4..646119df 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java @@ -96,6 +96,10 @@ public class Cet_4ServiceImpl extends ServiceImpl implements @Override public Result getRateByBatch(String college, String batchStr) { + + if (redisTemplate.opsForValue().get("getRateByBatch" + college + batchStr) != null) { + return Result.ok((JSONObject) redisTemplate.opsForValue().get("getRateByBatch" + college + batchStr)); + } SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); DecimalFormat decimalFormat = new DecimalFormat("#.#"); Date batch; @@ -176,6 +180,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements resultData.put("data", jsonObject); resultData.put("gradeData", gradeByBatch); System.out.println(resultData); + redisTemplate.opsForValue().set("getRateByBatch" + college + batchStr, resultData); return Result.OK(resultData); } From ac0523706f67a07f7f005e379422caf2e5f00521 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Tue, 10 Dec 2024 15:51:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8C=89=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E5=AF=B9=E6=AF=94=E5=88=86=E6=9E=90=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E5=B9=B4=E7=BA=A7=E9=80=9A=E8=BF=87=E7=8E=87?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/service/impl/Cet_4ServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java index 78ea35d3..7ccea6d2 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java @@ -128,6 +128,7 @@ public class Cet_4ServiceImpl extends ServiceImpl implements if(college.equals("全校")){ collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getCollege)); }else{ + //TODO：majorname为空时存在异常 collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getMajorname)); } @@ -591,7 +592,9 @@ public class Cet_4ServiceImpl extends ServiceImpl implements if (getRateByEntryDateDtoParams.getMajor() != null && !getRateByEntryDateDtoParams.getMajor().isEmpty()) { cet4StudentCount.eq(Cet_4::getMajorname, getRateByEntryDateDtoParams.getMajor()); } - long allStudentCount = cet4Mapper.selectCount(cet4StudentCount); + cet4StudentCount.groupBy(Cet_4::getCode); + List allStudentList = cet4Mapper.selectObjs(cet4StudentCount); + long allStudentCount = allStudentList.size(); // 统计当前 entryDate 下的通过人数 //所有参加过四级考试的学生 Map attendMap4 = new HashMap<>();