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 7460bba0..e69345a3 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 @@ -47,8 +47,11 @@ public class Cet_4ServiceImpl extends ServiceImpl implements } else { queryWrapper.eq(Cet_4::getCollege, college).eq(Cet_4::getMajorname, major).ge(Cet_4::getResult, 425); } + queryWrapper.orderByAsc(Cet_4::getBatch); List result = cet4Mapper.selectList(queryWrapper); - Map> collect = result.stream().collect(Collectors.groupingBy(Cet_4::getBatch)); + + Map> collect = result.stream().collect(Collectors.groupingBy(Cet_4::getBatch,LinkedHashMap::new,Collectors.toList())); + for (Map.Entry> entry : collect.entrySet()) { double sum; if (major.equals("")) {