From 2376619f6360f84c77840ff5218f725b41459ab5 Mon Sep 17 00:00:00 2001 From: YuNan <3194726156@qq.com> Date: Sat, 11 Jan 2025 23:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=8D=95=E6=89=B9=E6=AC=A1=E5=88=86?= =?UTF-8?q?=E6=9E=90-=E8=A7=A3=E5=86=B3=E5=BD=93=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9B=B8=E5=85=B3=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=88map=E6=98=A0=E5=B0=84=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/Cet_4ServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 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)); } // 过滤除去错误的数据