1目标时间

Edu.Module.OKR/OKRPeriodModule.cs

@@ -729,7 +729,7 @@ namespace Edu.Module.OKR
             foreach (var item in list)
             {
                 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;
                 }
             }
@@ -1058,6 +1058,7 @@ namespace Edu.Module.OKR
                 x.IsNotLook,
                 x.ScoreName,
                 x.ScoreColor,
+                CreateTime = x.CreateTime.ToString("MM-dd"),
                 KeyResultList = x.KeyResultList.Select(z => new
                 {
                     z.Id,
@@ -1574,6 +1575,7 @@ namespace Edu.Module.OKR
                     x.IsNotLook,
                     x.ScoreName,
                     x.ScoreColor,
+                    CreateTime = x.CreateTime.ToString("MM-dd"),
                     KeyResultList = x.KeyResultList.Where(x=>x.IsNotLook == 2).Select(z => new
                     {
                         z.Id,