Skip to content

E
Education
Commit 8355763d authored by liudong1993's avatar liudong1993
Browse files
Options

okr调整

parent f50aa0c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 32 deletions
Edu.Module.OKR/OKRPeriodModule.cs
View file @ 8355763d
This diff is collapsed.
Edu.WebApi/Controllers/OKR/OKRPeriodController.cs
View file @ 8355763d
...@@ -444,11 +444,10 @@ namespace Edu.WebApi.Controllers.OKR ...@@ -444,11 +444,10 @@ namespace Edu.WebApi.Controllers.OKR
{ {
return ApiResult.ParamIsNull("请传递周期id"); return ApiResult.ParamIsNull("请传递周期id");
} }
string msg = okrPeriodModule.SetOKRMyObjectiveInfo(dmodel, userInfo, out int ObjectiveId);
string msg = okrPeriodModule.SetOKRMyObjectiveInfo(dmodel, userInfo);
if (msg == "") if (msg == "")
{ {
return ApiResult.Success(); return ApiResult.Success("", ObjectiveId);
} }
else else
{ {
...@@ -472,15 +471,15 @@ namespace Edu.WebApi.Controllers.OKR ...@@ -472,15 +471,15 @@ namespace Edu.WebApi.Controllers.OKR
{ {
return ApiResult.ParamIsNull("请传递结果值"); return ApiResult.ParamIsNull("请传递结果值");
} }
if (KeyResultId <= 0 || ObjectiveId <= 0) if (KeyResultId <= 0 && ObjectiveId <= 0)
{ {
return ApiResult.ParamIsNull("结果id不正确"); return ApiResult.ParamIsNull("结果id不正确");
} }
string msg = okrPeriodModule.SetOKRMyKeyResultInfo(KeyResultId, ObjectiveId, Name, userInfo); string msg = okrPeriodModule.SetOKRMyKeyResultInfo(KeyResultId, ObjectiveId, Name, userInfo, out int RKeyResultId);
if (msg == "") if (msg == "")
{ {
return ApiResult.Success(); return ApiResult.Success("", RKeyResultId);
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment