Prechádzať zdrojové kódy

修改一三象限okr任务修改异常

songyh 3 rokov pred
rodič
commit
2b71ca7347

+ 2 - 7
src/main/java/cn/com/ctop/okr/Application.java

@@ -3,21 +3,16 @@ package cn.com.ctop.okr;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.core.env.Environment;
 
-import java.net.UnknownHostException;
 @Slf4j
 @SpringBootApplication
 @ComponentScan(basePackages = {"cn.com.ctop"})
 @Configuration
 public class Application {
-    public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(Application.class, args);
-        Environment env = application.getEnvironment();
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
         log.info("\n----------------------------------------------------------\n\t" +
                 "okr service is running\n\t" +
                 "----------------------------------------------------------");

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

@@ -10,7 +10,7 @@ import java.util.Map;
 public interface IOkrWeekDataService extends IService<OkrWeekData> {
     OkrWeekData getWeekByDate(String now);
 
-    Map<Integer, List<Integer>> getWeeksByMonths(Integer year,List<Integer> months);
+    Map<Integer, Object> getWeeksByMonths(Integer year,List<Integer> months);
 
     OkrWeekData getWeekByYearAndWeek(Integer year, int week);
 }

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

@@ -69,6 +69,7 @@ public class OkrObjectInfoServiceImpl extends ServiceImpl<OkrObjectInfoMapper, O
         int  year = DateUtils.getYear(new Date());
         years.add(year-1);
         years.add(year);
+        years.add(year+1);
         return years;
     }
 }

+ 3 - 2
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

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

+ 10 - 4
src/main/java/cn/com/ctop/okr/service/impl/OkrWeekDataServiceImpl.java

@@ -3,6 +3,8 @@ package cn.com.ctop.okr.service.impl;
 import cn.com.ctop.okr.entity.OkrWeekData;
 import cn.com.ctop.okr.mapper.OkrWeekDataMapper;
 import cn.com.ctop.okr.service.IOkrWeekDataService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -22,16 +24,20 @@ public class OkrWeekDataServiceImpl extends ServiceImpl<OkrWeekDataMapper, OkrWe
     }
 
     @Override
-    public Map<Integer, List<Integer>> getWeeksByMonths(Integer year,List<Integer> months) {
-        Map<Integer,List<Integer>> result = new HashMap<>();
+    public Map<Integer, Object> getWeeksByMonths(Integer year,List<Integer> months) {
+        Map<Integer,Object> result = new HashMap<>();
         if(null == months||months.isEmpty()){
             return result;
         }
         for(int i=0;i<months.size();i++){
             List<OkrWeekData>dataList = this.getWeekByYearAndMonth(year,months.get(i));
-            List<Integer>getWeek = new ArrayList<>();
+            JSONArray getWeek = new JSONArray();
             for(OkrWeekData data:dataList){
-                getWeek.add(data.getWeek());
+                JSONObject weekObject = new JSONObject();
+                weekObject.put("week",data.getWeek());
+                weekObject.put("startDate",data.getStartDate());
+                weekObject.put("endDate",data.getEndDate());
+                getWeek.add(weekObject);
             }
             result.put(months.get(i),getWeek);
         }