From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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..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
@@ -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,11 @@
})
@PostMapping(value = "/findStaffAchieveRanking")
public AjaxResult findStaffAchieveRanking(@RequestBody RankingDto rankingDto) {
- return null;
+ AchieveNew achieveNew = new AchieveNew();
+ QueryUtil.setQueryLimitCom(achieveNew);
+ achieveNew.setType(rankingDto.getType());
+ achieveNew.setDatatime(new Date());
+ return AjaxResult.buildSuccessInstance(achieveNewDao.selectStaffSaleAchieveRanking(achieveNew));
}
@ApiOperation(value = "门店业绩排行榜", notes = "门店业绩排行榜")
@@ -57,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(DateUtil.stringToDate(rankingDto.getTime(), DateUtil.DATE_FORMAT_DD));
- 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(DateUtil.stringToDate(rankingDto.getTime(), DateUtil.DATE_FORMAT_DD));
- achieveNew.setT1(rankingDto.getType());
List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
ajaxResult.setRows(rankingVos);
}
@@ -81,6 +80,10 @@
})
@PostMapping(value = "/findBeauticianAchieveRanking")
public AjaxResult findBeauticianAchieveRanking(@RequestBody RankingDto rankingDto) {
- return null;
+ AchieveNew achieveNew = new AchieveNew();
+ QueryUtil.setQueryLimitCom(achieveNew);
+ achieveNew.setDatatime(new Date());
+ achieveNew.setT1(rankingDto.getType());
+ return AjaxResult.buildSuccessInstance(achieveNewDao.selectBeauticianConsumeAchieveRanking(achieveNew));
}
}
--
Gitblit v1.9.1