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] =?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); }