LIVE_YE 4 сар өмнө
parent
commit
8c7c54d1d6

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

@@ -138,11 +138,11 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService
 
     @Override
     public AjaxResult statisticsQx() {
-        List<Object> mapList = new ArrayList<>();
+        Map<String,Object> mapList = new HashMap<>();
         List<String> weekDays = DateUtils.getPreviousSevenDays(DateUtils.YYYY_MM_DD);
         String starTime = weekDays.get(0);
         String endTime = weekDays.get(weekDays.size()-1);
-        mapList.add(weekDays);
+        mapList.put("x",weekDays);
         //查询两个日期内的保修数据
         List<PropertyRepair> propertyRepairs = propertyRepairMapper.selectPropertyRepairListByTime(starTime, endTime);
         List<Integer> numList = new ArrayList<>();
@@ -156,7 +156,7 @@ public class PropertyRepairServiceImpl implements IPropertyRepairService
             }
             numList.add(num);
         }
-        mapList.add(numList);
+        mapList.put("y",numList);
         return AjaxResult.success(mapList);
     }
 }