From 6794d55dfc524bf534f0669e046d27d03dc4bc33 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Dec 2020 21:21:30 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/DataAnalysisCustomerServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/DataAnalysisCustomerServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/DataAnalysisCustomerServiceImpl.java
index 5b37ed0..f9dde6f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/DataAnalysisCustomerServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/DataAnalysisCustomerServiceImpl.java
@@ -49,7 +49,7 @@
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
List<SysShopInfo> shops = null;
if (statisticsParam.getShopId() != null) {
- shops = Arrays.asList(shopInfoDao.selectById(statisticsParam.getShopId()));
+ shops = Arrays.asList(shopInfoDao.selectById(user.getShopId()));
} else {
if (DataAuthUtil.hasAllShopAuth()) {
shops = shopInfoDao.selectShopInfo(user.getCompanyId());
@@ -84,7 +84,8 @@
Map<Object, Object> data = new HashMap<>();
data.put("legendData", legendData);
data.put("series", series);
- data.put("xAxis", StatisticsTimeUtil.getFormartDateList(xAxis, statisticsParam));
+ String[] xData = StatisticsTimeUtil.getFormartDateList(xAxis, statisticsParam);
+ data.put("xAxis", Arrays.copyOf(xData, xData.length - 1));
result.setMapInfo(data);
result.setStatus(AjaxResult.STATUS_SUCCESS);
return result;
@@ -107,6 +108,8 @@
//定义数据主体
String[] legendData = new String[1];
+ int i = 0;
+
//按门店统计数据
List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
@@ -124,7 +127,8 @@
Map<Object, Object> data = new HashMap<>();
data.put("legendData", legendData);
data.put("series", series);
- data.put("xAxis", StatisticsTimeUtil.getFormartDateList(xAxis, statisticsParam));
+ String[] xData = StatisticsTimeUtil.getFormartDateList(xAxis, statisticsParam);
+ data.put("xAxis", Arrays.copyOf(xData, xData.length - 1));
result.setMapInfo(data);
result.setStatus(AjaxResult.STATUS_SUCCESS);
return result;
--
Gitblit v1.9.1