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