From ddb1b788901cc9623b096ca5c5bad50d0bc8094b Mon Sep 17 00:00:00 2001 From: Strange <3304393868@qq.com> Date: Wed, 14 Feb 2024 03:33:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=A1=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=9B=BE=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/chart/chat.java | 15 +++++++++---- .../main/resources/templates/polyline.html | 22 +++++++++++++++---- .../ruoyi/app/system/domain/ChatDomain.java | 10 +++++++++ .../ruoyi/app/system/mapper/ChatMapper.java | 4 ++-- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/chart/chat.java b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/chart/chat.java index 555bad4..adb4d61 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/chart/chat.java +++ b/RuoYi-Vue/ruoyi-admin/src/main/java/com/ruoyi/web/controller/chart/chat.java @@ -26,14 +26,21 @@ public class chat { // @ResponseBody public String Polyline(Model model){ List dataList = chatMapper.pyline(); - List moneyList = new ArrayList<>(); + List moneyIncomeList = new ArrayList<>(); + List expenditureList = new ArrayList<>(); List monthList = new ArrayList<>(); for (ChatDomain chatDomain:dataList){ - moneyList.add(chatDomain.getTotal_money()); + if (chatDomain.getKind()==0){ + moneyIncomeList.add(chatDomain.getTotal_money()); + } + if (chatDomain.getKind()==1){ + expenditureList.add(chatDomain.getTotal_money()); + + } monthList.add(chatDomain.getMonth()); } - model.addAttribute("moneyList",moneyList); - model.addAttribute("monthList",monthList); + model.addAttribute("moneyIncomeList",moneyIncomeList); + model.addAttribute("expenditureList",expenditureList); return "/polyline"; } } diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/templates/polyline.html b/RuoYi-Vue/ruoyi-admin/src/main/resources/templates/polyline.html index 4ae2302..64fd5f3 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/resources/templates/polyline.html +++ b/RuoYi-Vue/ruoyi-admin/src/main/resources/templates/polyline.html @@ -7,11 +7,12 @@ - +