Skip to content

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

1目标时间

parent 23f94a39
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
Edu.Module.OKR/OKRPeriodModule.cs
View file @ e0fd2517
...@@ -729,7 +729,7 @@ namespace Edu.Module.OKR ...@@ -729,7 +729,7 @@ namespace Edu.Module.OKR
foreach (var item in list) foreach (var item in list)
{ {
item.IsCurrent = 2; item.IsCurrent = 2;
if (item.StartDate <= DateTime.Now && item.EndDate >= DateTime.Now) { if (item.StartDate <= DateTime.Now && item.EndDate >= DateTime.Now && item.IsNormal == 1 && item.IsYear == 2) {
item.IsCurrent = 1; item.IsCurrent = 1;
} }
} }
...@@ -1058,6 +1058,7 @@ namespace Edu.Module.OKR ...@@ -1058,6 +1058,7 @@ namespace Edu.Module.OKR
x.IsNotLook, x.IsNotLook,
x.ScoreName, x.ScoreName,
x.ScoreColor, x.ScoreColor,
CreateTime = x.CreateTime.ToString("MM-dd"),
KeyResultList = x.KeyResultList.Select(z => new KeyResultList = x.KeyResultList.Select(z => new
{ {
z.Id, z.Id,
...@@ -1574,6 +1575,7 @@ namespace Edu.Module.OKR ...@@ -1574,6 +1575,7 @@ namespace Edu.Module.OKR
x.IsNotLook, x.IsNotLook,
x.ScoreName, x.ScoreName,
x.ScoreColor, x.ScoreColor,
CreateTime = x.CreateTime.ToString("MM-dd"),
KeyResultList = x.KeyResultList.Where(x=>x.IsNotLook == 2).Select(z => new KeyResultList = x.KeyResultList.Where(x=>x.IsNotLook == 2).Select(z => new
{ {
z.Id, z.Id,
......
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