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<>();