趋势图

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/DataController.java

@@ -28,6 +28,7 @@ import com.gic.haoban.manage.web.qo.data.HandleQO;
 import com.gic.haoban.manage.web.utils.DateFillUtils;
 import com.gic.haoban.manage.web.utils.StoreAuthUtils;
 import com.gic.haoban.manage.web.vo.data.DataMemberExtendVO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +47,7 @@ import java.util.stream.Collectors;
  */
 @Controller
 @RequestMapping("data")
+@Slf4j
 public class DataController {
     @Autowired
     private StoreAuthUtils storeAuthUtils;
@@ -160,7 +162,11 @@ public class DataController {
                         (jsonObject.getInteger("storeGroup") == 3 || jsonObject.getInteger("storeGroup") == 4))
                 || (apolloKey.contains("data_mbr") && jsonObject.getInteger("storeGroup") == 2));
         if (isNeedFill) {
+            log.info("需要补零");
             List<JSONObject> resultList = DataApiUtils.getDataList(res);
+            if (CollectionUtils.isEmpty(resultList)) {
+                resultList = new ArrayList<>();
+            }
             List<String> dateTypeList = null;
             if (apolloKey.contains("day")) {
                 dateTypeList = DateFillUtils.getDay(jsonObject.getString("bizDate"));