修改经营时长

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/ChannelAnalyseServiceImpl.java

@@ -456,26 +456,33 @@ public class ChannelAnalyseServiceImpl implements ChannelAnalyseService {
         List<StoreWd> storeWds = storeWdDao.operateTimeAnalyse(queryWrapper);
 
         //2.统计经营时长
-        HashMap<Integer,Integer> hashMap = new HashMap<>();
+        //初始化
+        String[] arr = new String[]{"0~5","6~10","11~15","16~24"};
+        ArrayList<Histogram> list = new ArrayList<>();
+        for (String s:arr){
+            list.add(new Histogram(s,0));
+        }
+
         for (StoreWd storeWd : storeWds) {
             Integer opentime = Integer.valueOf(storeWd.getOpentime().substring(0,2));
             Integer closetime = Integer.valueOf(storeWd.getClosetime().substring(0,2));
             int i = closetime - opentime;
-            Integer integer = hashMap.get(i);
-            if (integer == null)
-                hashMap.put(i,1);
-            else
-                hashMap.put(i,integer+1);
+            if (i >=0 && i <=5){
+                Histogram histogram = list.get(0);
+                histogram.setCount(histogram.getCount()+1);
+            }else if (i >= 6 && i <= 10){
+                Histogram histogram = list.get(1);
+                histogram.setCount(histogram.getCount()+1);
+            }else if(i >= 11 && i <= 15){
+                Histogram histogram = list.get(2);
+                histogram.setCount(histogram.getCount()+1);
+            }else if(i >= 16){
+                Histogram histogram = list.get(3);
+                histogram.setCount(histogram.getCount()+1);
+            }
         }
 
-        //3.分装统计结果
-        ArrayList<Histogram> list = new ArrayList<>();
-        for (Integer s : hashMap.keySet()) {
-            Histogram histogram = new Histogram();
-            histogram.setName(s+"");
-            histogram.setCount(hashMap.get(s));
-            list.add(histogram);
-        }
+        //3.返回结果
         return list;
     }