From 7854eeda4763e0bd995226bc7c407fde5080e79c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Dec 2020 10:43:21 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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..2485f03 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;
@@ -36,6 +38,9 @@
@Autowired
private AchieveNewService achieveNewService;
+ @Autowired
+ private AchieveNewDao achieveNewDao;
+
@ApiOperation(value = "顾问业绩排行榜", notes = "顾问业绩排行榜")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = RankingVo.class)
@@ -60,7 +65,12 @@
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.setT1(rankingDto.getType());
+ List<RankingVo> rankingVos = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
+ ajaxResult.setRows(rankingVos);
}
return ajaxResult;
}
--
Gitblit v1.9.1