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 @@ - +