From 707c119dd658e2c21683413edae0b9d01dda51e8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Dec 2020 10:51:57 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 5 +++--
zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java | 11 -----------
2 files changed, 3 insertions(+), 13 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..6493af5 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;
/**
@@ -61,13 +62,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);
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java
index 287f522..3c3d788 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/RankingDto.java
@@ -25,9 +25,6 @@
@ApiModelProperty(value = "排行榜类型 1-日榜 2-月榜 3-年榜", example = "1")
private String type;
- @ApiModelProperty(value = "时间", example = "2020-12-25")
- private String time;
-
public String getDataType() {
return dataType;
}
@@ -42,13 +39,5 @@
public void setType(String type) {
this.type = type;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
}
}
--
Gitblit v1.9.1