Browse Source

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

songyh 3 năm trước cách đây
mục cha
commit
7e3fbcd7ef

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

@@ -155,7 +155,12 @@ public class OkrServiceImpl implements OkrService {
         QYWxUserInfo sysUser = (QYWxUserInfo) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getOpenId();
         String now = DateUtils.formatDate();
-        OkrWeekData weekData = weekDataService.getWeekByDate(now);
+        OkrWeekData weekData = null;
+        if(null == taskInfo.getWeek()||null == taskInfo.getYear()){
+            weekData = weekDataService.getWeekByDate(now);
+        }else{
+            weekData = weekDataService.getWeekByYearAndWeek(taskInfo.getYear(),taskInfo.getWeek());
+        }
         taskInfo.setUserId(userId);
         taskInfo.setYear(weekData.getYear());
         taskInfo.setQuarter(weekData.getQuarter());
@@ -253,7 +258,7 @@ public class OkrServiceImpl implements OkrService {
         }
         okrTaskInfoService.updateById(getTask);
         if(taskInfo.getStatus() == 2){
-            if(taskInfo.getType() == 2){
+            if(getTask.getType() == 2){
                 //月份信息数据
                 getTask.setStatus(1);
                 int month = getTask.getMonth();