|
@@ -420,8 +420,8 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
map.put("isCurrentQuarter",isCurrentQuarter);
|
|
map.put("isCurrentQuarter",isCurrentQuarter);
|
|
map.put("list",mapList);
|
|
map.put("list",mapList);
|
|
- map.put("year",todayYear);
|
|
|
|
- map.put("quarter",todayQuarter);
|
|
|
|
|
|
+ map.put("year",year);
|
|
|
|
+ map.put("quarter",quarter);
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -483,8 +483,8 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
map.put("isCurrentQuarter",isCurrentQuarter);
|
|
map.put("isCurrentQuarter",isCurrentQuarter);
|
|
map.put("list",mapList);
|
|
map.put("list",mapList);
|
|
- map.put("year",todayYear);
|
|
|
|
- map.put("quarter",todayQuarter);
|
|
|
|
|
|
+ map.put("year",year);
|
|
|
|
+ map.put("quarter",quarter);
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -552,8 +552,8 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
map.put("isCurrentQuarter",isCurrentQuarter);
|
|
map.put("isCurrentQuarter",isCurrentQuarter);
|
|
map.put("list",mapList);
|
|
map.put("list",mapList);
|
|
- map.put("year",todayYear);
|
|
|
|
- map.put("quarter",todayQuarter);
|
|
|
|
|
|
+ map.put("year",year);
|
|
|
|
+ map.put("quarter",quarter);
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|