|
@@ -1628,10 +1628,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
public List<UserDto2> kuaishouPerformanceInfoNow() {
|
|
|
//0 获取当前季度的时间
|
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
|
- //Integer year = dateMap.get("year");
|
|
|
- //Integer quarter = dateMap.get("quarter");
|
|
|
- int year = 2019;
|
|
|
- int quarter = 4;
|
|
|
+ Integer year = dateMap.get("year");
|
|
|
+ Integer quarter = dateMap.get("quarter");
|
|
|
+ //int year = 2019;
|
|
|
+ //int quarter = 4;
|
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
String startTime = timeMap.get("startDate");
|
|
|
String endTime = timeMap.get("endDate");
|
|
@@ -1670,10 +1670,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
public List<UserDto2> kuaishouYouhuaPerformanceInfoNow() {
|
|
|
//0 获取当前季度的时间
|
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
|
- //Integer year = dateMap.get("year");
|
|
|
- //Integer quarter = dateMap.get("quarter");
|
|
|
- int year = 2019;
|
|
|
- int quarter = 4;
|
|
|
+ Integer year = dateMap.get("year");
|
|
|
+ Integer quarter = dateMap.get("quarter");
|
|
|
+ //int year = 2019;
|
|
|
+ //int quarter = 4;
|
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
String startTime = timeMap.get("startDate");
|
|
|
String endTime = timeMap.get("endDate");
|
|
@@ -1698,10 +1698,10 @@ public class PerformanceServiceImpl2 extends ServiceImpl<PerformanceMapper, Perf
|
|
|
public List<UserDto2> toutiaoYouhuaPerformanceInfoNow() {
|
|
|
//0 获取当前季度的时间
|
|
|
Map<String, Integer> dateMap = DateUtils.getYearQuarter(new Date());
|
|
|
- //Integer year = dateMap.get("year");
|
|
|
- //Integer quarter = dateMap.get("quarter");
|
|
|
- int year = 2019;
|
|
|
- int quarter = 4;
|
|
|
+ Integer year = dateMap.get("year");
|
|
|
+ Integer quarter = dateMap.get("quarter");
|
|
|
+ //int year = 2019;
|
|
|
+ //int quarter = 4;
|
|
|
Map<String, String> timeMap = DateUtils.quarterStartEndDate(year, quarter);
|
|
|
String startTime = timeMap.get("startDate");
|
|
|
String endTime = timeMap.get("endDate");
|