From 2bc39e9183e62818dcfbb3cdfc6cdca5dfa43923 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 15:37:52 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 2485f03..9389cc0 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
@@ -21,6 +21,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Date;
import java.util.List;
/**
@@ -36,9 +37,6 @@
private SysOrderService sysOrderService;
@Autowired
- private AchieveNewService achieveNewService;
-
- @Autowired
private AchieveNewDao achieveNewDao;
@ApiOperation(value = "顾问业绩排行榜", notes = "顾问业绩排行榜")
@@ -47,7 +45,15 @@
})
@PostMapping(value = "/findStaffAchieveRanking")
public AjaxResult findStaffAchieveRanking(@RequestBody RankingDto rankingDto) {
- return null;
+ SysOrder sysOrder = new SysOrder();
+ if (DataAuthUtil.hasAllShopAuth()) {
+ QueryUtil.setQueryLimitCom(sysOrder);
+ } else {
+ QueryUtil.setQueryLimit(sysOrder);
+ }
+ sysOrder.setOrderTime(new Date());
+ sysOrder.setType(rankingDto.getType());
+ return AjaxResult.buildSuccessInstance(sysOrderService.findStaffSaleAchieveRanking(sysOrder));
}
@ApiOperation(value = "门店业绩排行榜", notes = "门店业绩排行榜")
@@ -61,13 +67,13 @@
SysOrder sysOrder = new SysOrder();
QueryUtil.setQueryLimitCom(sysOrder);
sysOrder.setType(rankingDto.getType());
- sysOrder.setOrderTime(DateUtil.stringToDate(rankingDto.getTime(), DateUtil.DATE_FORMAT_DD));
+ sysOrder.setOrderTime(new Date());
List<RankingVo> list = sysOrderService.findApiShopAchieveRanking(sysOrder);
ajaxResult.setRows(list);
} else {
AchieveNew achieveNew = new AchieveNew();
QueryUtil.setQueryLimitCom(achieveNew);
- achieveNew.setDatatime(DateUtil.stringToDate(rankingDto.getTime(), DateUtil.DATE_FORMAT_DD));
+ achieveNew.setDatatime(new Date());
achieveNew.setT1(rankingDto.getType());
List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
ajaxResult.setRows(rankingVos);
@@ -81,6 +87,14 @@
})
@PostMapping(value = "/findBeauticianAchieveRanking")
public AjaxResult findBeauticianAchieveRanking(@RequestBody RankingDto rankingDto) {
- return null;
+ AchieveNew achieveNew = new AchieveNew();
+ if (DataAuthUtil.hasAllShopAuth()) {
+ QueryUtil.setQueryLimitCom(achieveNew);
+ } else {
+ QueryUtil.setQueryLimit(achieveNew);
+ }
+ achieveNew.setDatatime(new Date());
+ achieveNew.setT1(rankingDto.getType());
+ return AjaxResult.buildSuccessInstance(achieveNewDao.selectBeauticianConsumeAchieveRanking(achieveNew));
}
}
--
Gitblit v1.9.1