liuhaotian 2 роки тому
батько
коміт
5b4a047996

+ 6 - 1
src/main/java/com/sky/ioc/service/space/impl/SpaceServiceImpl.java

@@ -3,8 +3,10 @@ package com.sky.ioc.service.space.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.sky.ioc.entity.Indeicator;
+import com.sky.ioc.entity.Label;
 import com.sky.ioc.entity.params.IocDateParam;
 import com.sky.ioc.service.space.SpaceService;
+import com.sky.ioc.tool.GeneralMethod;
 import com.sky.ioc.tool.ReturnMsg;
 import org.springframework.stereotype.Service;
 
@@ -90,7 +92,10 @@ public class SpaceServiceImpl implements SpaceService {
 
     @Override
     public ReturnMsg getMeetingCostTrend(IocDateParam iocDateParam) {
-        return null;
+        String[] param = {"shichang","bangong","chanpin","zhihui","yewu","qita"};
+        String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
+        List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
+        return ReturnMsg.ok(labels1);
     }
 
     @Override

+ 1 - 1
src/main/java/com/sky/ioc/service/supermarket/impl/SupermarketServiceImpl.java

@@ -43,7 +43,7 @@ public class SupermarketServiceImpl implements SupermarketService {
 
     @Override
     public ReturnMsg getQuotientAnalysiss(IocDateParam iocDateParam) {
-        String[] param = {"breakfastTotal","lunchTotal","dinnerTotal","breakfastOrder","lunchOrder","dinnerOrder"};
+        String[] param = {"morningTotal","afternoonTotal","morningOrder","afternoonOrder","averageOrder"};
         String[] labKey = {"1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"};
         List<Label> labels1 = GeneralMethod.getInstance().dataGeneration(param, labKey);
         return ReturnMsg.ok(labels1);