From a672e4e8c05be9c763943a06cfe5220ef217934c Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 23 Jan 2021 20:07:44 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java
index 1cd802f..14b05f9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java
@@ -3,15 +3,21 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.hive.dao.SysBusinessDataDao;
+import com.matrix.system.hiveErp.analysUtil.StatisticsTimeDaoParam;
+import com.matrix.system.hiveErp.analysUtil.StatisticsTimeUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -44,5 +50,56 @@
return result;
}
+ /**
+ * 日销售汇总
+ *
+ * @param dailySaleVo
+ * @param pageVo
+ * @return
+ */
+ @RequestMapping(value = "/findDailySaleData")
+ @ResponseBody
+ public AjaxResult findDailySaleData(DailySaleVo dailySaleVo, PaginationVO pageVo) {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ Calendar calendar = Calendar.getInstance();
+ int total = 999;
+
+ Date endDate = new Date();
+ if (dailySaleVo.getEndTime() != null) {
+ if (!dailySaleVo.getEndTime().after(new Date())) {
+ calendar.setTime(dailySaleVo.getEndTime());
+ endDate = DateUtil.nextNDate(dailySaleVo.getEndTime(), 1);
+ }
+ }
+
+ calendar.add(Calendar.DATE, 1);
+ calendar.add(Calendar.DATE, -pageVo.getOffset());
+ String endTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
+ calendar.add(Calendar.DATE, -pageVo.getLimit());
+ String startTime = DateUtil.dateToString(calendar.getTime(), DateUtil.DATE_FORMAT_DD);
+
+ if (dailySaleVo.getBeginTime() != null) {
+ Date startDate = DateUtil.stringToDate(startTime, DateUtil.DATE_FORMAT_DD);
+ if(dailySaleVo.getBeginTime().after(startDate)) {
+ startTime = DateUtil.dateFormatStr(dailySaleVo.getBeginTime(), DateUtil.DATE_FORMAT_DD);
+ }
+ long sub = DateUtil.getTimeSpan(dailySaleVo.getBeginTime(), endDate, null);
+ Long l = sub / (1000 * 3600 * 24);
+ total = l.intValue();
+ }
+ List<Date> xAxis = StatisticsTimeUtil.getTimeSpace(startTime, endTime, "日");
+ List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
+ List<StatisticsTimeDaoParam> statisticsTimeDaoParams = timeSpaceParam.subList(0, timeSpaceParam.size() - 2);
+
+ if (dailySaleVo.getShopId() == null) {
+ dailySaleVo.setShopId(user.getShopId());
+ }
+ List<DailySaleVo> dailySaleVos = sysBusinessDataDao.selectDailySaleData(statisticsTimeDaoParams, dailySaleVo.getShopId());
+ List<DailySaleVo> result = new ArrayList<>();
+ for (int i = dailySaleVos.size() - 1; i >= 0; i--) {
+ result.add(dailySaleVos.get(i));
+ }
+ return AjaxResult.buildSuccessInstance(result, total);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1