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 | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 58 insertions(+), 23 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 b632743..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
@@ -8,16 +8,14 @@
import com.matrix.system.app.dto.VipStatisticsParamDto;
import com.matrix.system.app.vo.BeauticianVo;
import com.matrix.system.app.vo.BusinessesDataShowVo;
+import com.matrix.system.app.vo.VipAchieveDataShowVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.bean.SysBusinessData;
import com.matrix.system.hive.dao.SysBusinessDataDao;
import com.matrix.system.hive.service.imp.DataAnalysisCustomerServiceImpl;
-import com.matrix.system.hiveErp.analysUtil.Caculate;
-import com.matrix.system.hiveErp.analysUtil.SeriesVo;
-import com.matrix.system.hiveErp.analysUtil.StatisticsParamVo;
-import com.matrix.system.hiveErp.analysUtil.StatisticsTimeDaoParam;
+import com.matrix.system.hiveErp.analysUtil.*;
import com.matrix.system.hiveErp.dao.TjVipSumDao;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,10 +26,7 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author wzy
@@ -57,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 = "专项")
@@ -156,7 +149,7 @@
@ApiOperation(value = "查询员工业绩报表", notes = "查询员工业绩报表")
@ApiResponses({
- @ApiResponse(code = 200, message = "ok", response = BusinessesDataShowVo.class)
+ @ApiResponse(code = 200, message = "ok", response = VipAchieveDataShowVo.class)
})
@PostMapping(value = "/findVipAchieve")
public AjaxResult findVipAchieve(@RequestBody BusinessesDto businessesDto) {
@@ -183,7 +176,49 @@
@ApiOperation(value = "员工专项", notes = "员工专项")
@PostMapping(value = "/findVipBusinessData")
public AjaxResult findVipBusinessData(@RequestBody @Validated VipStatisticsParamDto vipStatisticsParamDto) {
- return null;
+ AjaxResult ajaxResult = dataAnalysisCustomerService.getStaffAnalysisResult(vipStatisticsParamDto, new Caculate<BigDecimal>() {
+ @Override
+ public Map<String, BigDecimal> exec(List<StatisticsTimeDaoParam> timeSpaceParam, Long shopId, Long staffId) {
+ switch (vipStatisticsParamDto.getType()) {
+ case "1" :
+ return tjVipSumDao.selectStaffOrderAchieve(timeSpaceParam, staffId);
+ case "2" :
+ return tjVipSumDao.selectStaffCashAchieve(timeSpaceParam, staffId);
+ case "3" :
+ return tjVipSumDao.selectStaffCardAchieve(timeSpaceParam, staffId);
+ case "4" :
+ return tjVipSumDao.selectStaffGoodsAchieve(timeSpaceParam, staffId);
+ case "5" :
+ return tjVipSumDao.selectStaffCardUseAchieve(timeSpaceParam, staffId);
+ case "6" :
+ return tjVipSumDao.selectStaffHisConsumeAchieve(timeSpaceParam, staffId);
+ case "7" :
+ return tjVipSumDao.selectStaffFreeConsumeAchieve(timeSpaceParam, staffId);
+ case "8" :
+ return tjVipSumDao.selectStaffCommissionAchieve(timeSpaceParam, staffId);
+ case "9" :
+ return tjVipSumDao.selectStaffPeopleNum(timeSpaceParam, staffId);
+ case "10" :
+ return tjVipSumDao.selectStaffProjNum(timeSpaceParam, staffId);
+ case "11" :
+ return tjVipSumDao.selectStaffProjTime(timeSpaceParam, staffId);
+ default:
+ return tjVipSumDao.selectStaffOrderAchieve(timeSpaceParam, staffId);
+ }
+ }
+ });
+
+ return setDataList(ajaxResult);
}
+ @ApiOperation(value = "测试", notes = "测试")
+ @GetMapping(value = "/findTestData")
+ public AjaxResult findTestData() {
+ List<Date> xAxis = StatisticsTimeUtil.getTimeSpace("2021-01-13", "2021-01-13", "日");
+
+ List<StatisticsTimeDaoParam> timeSpaceParam = StatisticsTimeUtil.buidParam(xAxis);
+// List<BusinessesDataShowVo> businessesDataShowVo = sysBusinessDataDao.selectDemo2();
+ List<BusinessesDataShowVo> map = sysBusinessDataDao.selectDemo(timeSpaceParam, 34L, 17L);
+ return AjaxResult.buildSuccessInstance(map);
+ }
}
--
Gitblit v1.9.1