|
@@ -558,12 +558,27 @@ public class OkrServiceImpl implements OkrService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, Object> getOkrDetail() {
|
|
|
+ public Map<String, Object> getOkrDetail(JSONObject data) {
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
|
|
|
String currentUserId = sysUser.getOpenId();
|
|
|
- Integer year = DateUtils.getYear(new Date());
|
|
|
- Integer quarter = DateUtils.getQuarter(new Date());
|
|
|
+ Integer year = data.getInteger("year");
|
|
|
+ Integer quarter = data.getInteger("quarter");
|
|
|
+ Integer currentYear = DateUtils.getYear(new Date());
|
|
|
+ if(null == year||year == 0){
|
|
|
+ year = currentYear;
|
|
|
+ }
|
|
|
+ Integer currentQuarter = DateUtils.getQuarter(new Date());
|
|
|
+ if(null == quarter||quarter == 0){
|
|
|
+ quarter = currentQuarter;
|
|
|
+ }
|
|
|
+ Map<String,Object> timeMap = new HashMap<>();
|
|
|
+ timeMap.put("year", year);
|
|
|
+ timeMap.put("quarter",quarter);
|
|
|
+ timeMap.put("currentYear",currentYear);
|
|
|
+ timeMap.put("currentQuarter",currentQuarter);
|
|
|
+ result.put("time", timeMap);
|
|
|
+
|
|
|
OkrObjectInfo objectInfo =objectInfoService.getByParams(currentUserId,year,quarter);
|
|
|
if(null == objectInfo){
|
|
|
return result;
|
|
@@ -591,10 +606,6 @@ public class OkrServiceImpl implements OkrService {
|
|
|
|
|
|
//状态信息
|
|
|
List<OkrContentStatus> contentStatusList = okrContentStatusMapper.getContentStatusList(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
|
|
|
- Map<String,Object> timeMap = new HashMap<>();
|
|
|
- timeMap.put("year",objectInfo.getYear());
|
|
|
- timeMap.put("quarter",objectInfo.getQuarter());
|
|
|
- result.put("time", timeMap);
|
|
|
result.put("taskInfoList",setTaskList);
|
|
|
result.put("taskFourWeekList",settaskFourWeekList);
|
|
|
result.put("okr",okrList);
|