From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
index 7cc09fe..f3d4d1f 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java
@@ -45,14 +45,11 @@
})
@PostMapping(value = "/findStaffAchieveRanking")
public AjaxResult findStaffAchieveRanking(@RequestBody RankingDto rankingDto) {
- SysOrder sysOrder = new SysOrder();
- if (DataAuthUtil.hasAllShopAuth()) {
- QueryUtil.setQueryLimitCom(sysOrder);
- } else {
- QueryUtil.setQueryLimit(sysOrder);
- }
- sysOrder.setType(rankingDto.getType());
- return AjaxResult.buildSuccessInstance(sysOrderService.findStaffSaleAchieveRanking(sysOrder));
+ AchieveNew achieveNew = new AchieveNew();
+ QueryUtil.setQueryLimitCom(achieveNew);
+ achieveNew.setType(rankingDto.getType());
+ achieveNew.setDatatime(new Date());
+ return AjaxResult.buildSuccessInstance(achieveNewDao.selectStaffSaleAchieveRanking(achieveNew));
}
@ApiOperation(value = "门店业绩排行榜", notes = "门店业绩排行榜")
@@ -62,18 +59,15 @@
@PostMapping(value = "/findShopAchieveRanking")
public AjaxResult findShopAchieveRanking(@RequestBody RankingDto rankingDto) {
AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("");
+ AchieveNew achieveNew = new AchieveNew();
+ QueryUtil.setQueryLimitCom(achieveNew);
+ achieveNew.setT1(rankingDto.getType());
+ achieveNew.setDatatime(new Date());
+
if (RankingDto.SALE.equals(rankingDto.getDataType())) {
- SysOrder sysOrder = new SysOrder();
- QueryUtil.setQueryLimitCom(sysOrder);
- sysOrder.setType(rankingDto.getType());
- sysOrder.setOrderTime(new Date());
- List<RankingVo> list = sysOrderService.findApiShopAchieveRanking(sysOrder);
+ List<RankingVo> list = achieveNewDao.selectShopSaleAchieveRanking(achieveNew);
ajaxResult.setRows(list);
} else {
- AchieveNew achieveNew = new AchieveNew();
- QueryUtil.setQueryLimitCom(achieveNew);
- achieveNew.setDatatime(new Date());
- achieveNew.setT1(rankingDto.getType());
List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
ajaxResult.setRows(rankingVos);
}
@@ -87,11 +81,7 @@
@PostMapping(value = "/findBeauticianAchieveRanking")
public AjaxResult findBeauticianAchieveRanking(@RequestBody RankingDto rankingDto) {
AchieveNew achieveNew = new AchieveNew();
- if (DataAuthUtil.hasAllShopAuth()) {
- QueryUtil.setQueryLimitCom(achieveNew);
- } else {
- QueryUtil.setQueryLimit(achieveNew);
- }
+ QueryUtil.setQueryLimitCom(achieveNew);
achieveNew.setDatatime(new Date());
achieveNew.setT1(rankingDto.getType());
return AjaxResult.buildSuccessInstance(achieveNewDao.selectBeauticianConsumeAchieveRanking(achieveNew));
--
Gitblit v1.9.1