From ed55b07e0000d99d0aeb796649077d178256fbb8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Jan 2021 17:17:08 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 4004241..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
@@ -6,7 +6,9 @@
import com.matrix.system.app.vo.RankingVo;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.bean.SysOrder;
+import com.matrix.system.hive.dao.AchieveNewDao;
import com.matrix.system.hive.service.AchieveNewService;
import com.matrix.system.hive.service.SysOrderService;
import io.swagger.annotations.Api;
@@ -19,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;
/**
@@ -34,7 +37,7 @@
private SysOrderService sysOrderService;
@Autowired
- private AchieveNewService achieveNewService;
+ private AchieveNewDao achieveNewDao;
@ApiOperation(value = "顾问业绩排行榜", notes = "顾问业绩排行榜")
@ApiResponses({
@@ -42,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 = "门店业绩排行榜")
@@ -56,11 +67,16 @@
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(new Date());
+ achieveNew.setT1(rankingDto.getType());
+ List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
+ ajaxResult.setRows(rankingVos);
}
return ajaxResult;
}
@@ -71,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