|
@@ -79,7 +79,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
OkrWeekData weekData = weekDataService.getWeekByDate(now);
|
|
|
List<Integer> months = DateUtils.getMonthsByQuarter(objectInfo.getQuarter());
|
|
|
//根据月份数据获取周
|
|
|
- Map<Integer, List<Integer>> weeks = weekDataService.getWeeksByMonths(objectInfo.getYear(),months);
|
|
|
+ Map<Integer, Object> weeks = weekDataService.getWeeksByMonths(objectInfo.getYear(),months);
|
|
|
Map<String,Object> timeMap = new HashMap<>();
|
|
|
timeMap.put("year",objectInfo.getYear());
|
|
|
timeMap.put("quarter",objectInfo.getQuarter());
|
|
@@ -626,7 +626,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
OkrWeekData weekData = weekDataService.getWeekByDate(now);
|
|
|
List<Integer> months = DateUtils.getMonthsByQuarter(quarter);
|
|
|
//根据月份数据获取周
|
|
|
- Map<Integer, List<Integer>> weeks = weekDataService.getWeeksByMonths(year,months);
|
|
|
+ Map<Integer, Object> weeks = weekDataService.getWeeksByMonths(year,months);
|
|
|
Map<String,Object> timeMap = new HashMap<>();
|
|
|
timeMap.put("year", year);
|
|
|
timeMap.put("quarter",quarter);
|
|
@@ -634,6 +634,7 @@ public class OkrServiceImpl implements OkrService {
|
|
|
timeMap.put("currentQuarter",weekData.getQuarter());
|
|
|
timeMap.put("currentMonth",weekData.getMonth());
|
|
|
timeMap.put("currentWeek",weekData.getWeek());
|
|
|
+ timeMap.put("currentDate",weekData.getStartDate()+"至"+weekData.getEndDate());
|
|
|
timeMap.put("months",months);
|
|
|
timeMap.put("weeks",weeks);
|
|
|
result.put("time", timeMap);
|