From ffd6f287975a4db6a059c72493fd0f72e89221da Mon Sep 17 00:00:00 2001 From: liuwu <975499773@qq.com> Date: Tue, 19 Sep 2023 10:05:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=92=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cyx/web/base/controller/BigScreenController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java index f4a39f4..34c4df0 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/BigScreenController.java @@ -145,13 +145,17 @@ public class BigScreenController extends BaseController { JSONArray dataArray = new JSONArray(); String month = DateUtils.parseDateToStr("YYYY-MM", new Date()); list.forEach(l -> { - typeArray.add(l.get("type")); + String month1 = l.get("month").toString(); + if (month1.equals(month)){ + typeArray.add(l.get("type")); + } JSONArray array = JSONArray.parseArray("[" + l.get("json").toString() + "]"); array.forEach(a -> { Map m = (Map) a; tradeMap.put(m.get("label").toString(), m.get("label").toString()); yearCount.addAndGet(Integer.parseInt(m.get("count").toString())); yearMoney.updateAndGet(v -> new Double((double) (v + Double.parseDouble(m.get("trade").toString())))); + }); }); // 所有小分类 @@ -162,6 +166,9 @@ public class BigScreenController extends BaseController { // 三个大分类 for (int i = 0; i < list.size(); i++) { String month1 = list.get(i).get("month").toString(); + if (!month1.equals(month)){ + continue; + } JSONArray array = JSONArray.parseArray("[" + list.get(i).get("json").toString() + "]"); AtomicInteger count = new AtomicInteger(); AtomicReference trade = new AtomicReference<>(0.0);