From 6903b5cf95d90ad9562df795b3b042df5ea914df Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Mon, 14 Dec 2020 17:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wisdomcar/service/StatisticsService.java  | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
index 86df0861..33edf5d6 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
@@ -28,18 +28,33 @@ public class StatisticsService implements IStatisticsService{
     public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) {
         StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo();
         List<StatisticsVo.UseNumVo> useNumVoNow = statisticsDao.selResult(param);
-        List<StatisticsVo.UseNumVo> sumLast=new ArrayList<StatisticsVo.UseNumVo>();
+        List<StatisticsVo.UseNumVo> sumNow=new ArrayList<StatisticsVo.UseNumVo>();
+        sumNow.add(useNumVoNow.get(0));
+        for (int i = 1; i < useNumVoNow.size(); i++) {
+            StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo();
+            useNumVo.setName(useNumVoNow.get(i).getName());
+            useNumVo.setNum(useNumVoNow.get(i).getNum()+useNumVoNow.get(i-1).getNum());
+            sumNow.add(useNumVo);
+        }
         useNumsVo.setSigleNow(useNumVoNow);
-        useNumsVo.setSumNow(useNumVoNow);
+        useNumsVo.setSumNow(sumNow);
+
+        //往年得
+
         Integer yaer=Integer.valueOf(param.getYear());
         yaer=yaer-1;
         param.setYear(String.valueOf(yaer));
         List<StatisticsVo.UseNumVo> useNumVosLast = statisticsDao.selResult(param);
+        List<StatisticsVo.UseNumVo> sumLast = new ArrayList<StatisticsVo.UseNumVo>();
+        sumLast.add(useNumVosLast.get(0));
+        for (int i = 1; i < useNumVosLast.size(); i++) {
+            StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo();
+            useNumVo.setName(useNumVosLast.get(i).getName());
+            useNumVo.setNum(useNumVosLast.get(i).getNum()+useNumVosLast.get(i-1).getNum());
+            sumLast.add(useNumVo);
+        }
         useNumsVo.setSigleLast(useNumVosLast);
-        useNumsVo.setSumLast(useNumVosLast);
-
-
-
+        useNumsVo.setSumLast(sumLast);
         return useNumsVo;
     }
 }