Przeglądaj źródła

我的okr 功能改版

syh 4 lat temu
rodzic
commit
32fdbe7f8c

+ 2 - 2
src/main/java/cn/com/ctop/okr/controller/OkrController.java

@@ -106,11 +106,11 @@ public class OkrController {
     }
 
     @RequestMapping(value = "/detail")
-    public Result okrDetail(){
+    public Result okrDetail(@RequestBody JSONObject data){
         Result<Map<String,Object>> result = new Result();
         result.setSuccess(true);
         try {
-            Map<String, Object> map = okrService.getOkrDetail();
+            Map<String, Object> map = okrService.getOkrDetail(data);
             result.setResult(map);
             return result;
         }catch(Exception e){

+ 1 - 1
src/main/java/cn/com/ctop/okr/service/OkrService.java

@@ -56,6 +56,6 @@ public interface OkrService{
 
     Map<String, Object> getMyDepartmentList(JSONObject data);
 
-    Map<String, Object> getOkrDetail();
+    Map<String, Object> getOkrDetail(JSONObject data);
 
 }

+ 6 - 1
src/main/java/cn/com/ctop/okr/service/impl/OkrObjectInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -64,6 +65,10 @@ public class OkrObjectInfoServiceImpl extends ServiceImpl<OkrObjectInfoMapper, O
 
     @Override
     public List<Integer> getObjectYear() {
-        return objectInfoMapper.getObjectYear();
+        List<Integer>years = new ArrayList<>();
+        int  year = DateUtils.getYear(new Date());
+        years.add(year-1);
+        years.add(year);
+        return years;
     }
 }

+ 18 - 7
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -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);