From 1bb16954b0630bd078483c06b26e835918ab7946 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Jan 2021 12:49:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
index 6eb5827..24514fb 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
@@ -52,23 +52,21 @@
})
@PostMapping(value = "/findShopBusinessesData")
public AjaxResult findShopBusinessesData(@RequestBody BusinessesDto businessesDto) {
- SysBusinessData sysBusinessData = new SysBusinessData();
- // 若shopId为空，则查询门店经营报表
- if (businessesDto.getShopId() == null) {
- sysBusinessData.setShopId(businessesDto.getShopId());
- }
- QueryUtil.setQueryLimitCom(sysBusinessData);
-
+ String unit = "";
if (BusinessesDto.DAY.equals(businessesDto.getType())) {
- sysBusinessData.setT1("%Y-%m-%d");
+ unit = "日";
} else {
- sysBusinessData.setT1("%Y-%m");
+ unit = "月";
}
- PaginationVO pageVo = new PaginationVO();
- pageVo.setOffset((businessesDto.getPageNum() - 1) * businessesDto.getPageSize());
- pageVo.setLimit(businessesDto.getPageSize());
- return AjaxResult.buildSuccessInstance(sysBusinessDataDao.selectApiBusinessDataInPage(sysBusinessData, pageVo), sysBusinessDataDao.selectApiBusinessDataTotal(sysBusinessData));
+ // PaginationVO pageVo = new PaginationVO();
+// pageVo.setOffset((businessesDto.getPageNum() - 1) * businessesDto.getPageSize());
+// pageVo.setLimit(businessesDto.getPageSize());
+ Calendar calendar = Calendar.getInstance();
+ Date now = calendar.getTime();
+ List<Date> xAxis = StatisticsTimeUtil.getTimeSpace("2021-01-13", "2021-01-13", unit);
+ List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
+ return AjaxResult.buildSuccessInstance("123");
}
@ApiOperation(value = "专项", notes = "专项")
--
Gitblit v1.9.1