首页保修曲线

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PropertyRepairServiceImpl.java

@@ -138,15 +138,15 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService
 
     @Override
     public AjaxResult statisticsQx() {
-        List<Map<String,Object>> mapList = new ArrayList<>();
+        List<Object> mapList = new ArrayList<>();
         List<String> weekDays = DateUtils.getPreviousSevenDays(DateUtils.YYYY_MM_DD);
         String starTime = weekDays.get(0);
         String endTime = weekDays.get(weekDays.size()-1);
+        mapList.add(weekDays);
         //查询两个日期内的保修数据
         List<PropertyRepair> propertyRepairs = propertyRepairMapper.selectPropertyRepairListByTime(starTime, endTime);
+        List<Integer> numList = new ArrayList<>();
         for (int i = 0; i < weekDays.size(); i++) {
-            Map<String,Object> map = new HashMap<>();
-            map.put("time",weekDays.get(i));
             int num = 0;
             for (PropertyRepair propertyRepair : propertyRepairs) {
                 String day = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, propertyRepair.getRepairTime());
@@ -154,9 +154,9 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService
                     num++;
                 }
             }
-            map.put("num",num);
-            mapList.add(map);
+            numList.add(num);
         }
+        mapList.add(numList);
         return AjaxResult.success(mapList);
     }
 }