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 950619d8..437542a3 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 @@ -97,9 +97,9 @@ 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)); - } +// 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; @@ -127,9 +127,10 @@ public class Cet_4ServiceImpl extends ServiceImpl implements 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{ - //TODO:majorname为空时存在异常 - collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getMajorname)); + } else { + collect = passedList.stream() + .filter(cet4 -> cet4.getMajorname() != null) + .collect(Collectors.groupingBy(Cet_4::getMajorname)); } // 过滤除去错误的数据