提交代码

Edu.Model/ViewModel/OKR/RB_OKR_Objective_ViewModel.cs

@@ -120,6 +120,12 @@ namespace Edu.Model.ViewModel.OKR
         /// 分数颜色
         /// </summary>
         public string ScoreColor { get; set; }
+
+
+        /// <summary>
+        /// 查询状态 1-查询状态本身等于2和3的  add by:W   2021-03-01
+        /// </summary>
+        public int selectStatus{get;set;}
     }
 
     /// <summary>

Edu.Module.OKR/OKRPeriodModule.cs

@@ -1681,7 +1681,8 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
                     }
                 }
             }
-            var list = oKR_ObjectiveRepository.GetList(new RB_OKR_Objective_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = PeriodId, CreateBy = userId, Status = 2 });
+            // var list = oKR_ObjectiveRepository.GetList(new RB_OKR_Objective_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = PeriodId, CreateBy = userId, Status = 2 });
+            var list = oKR_ObjectiveRepository.GetList(new RB_OKR_Objective_ViewModel() { Group_Id = userInfo.Group_Id, PeriodId = PeriodId, CreateBy = userId, selectStatus =1 });
             if (list.Any())
             {
                 string objectiveIds = string.Join(",", list.Select(x => x.Id));

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -91,7 +91,13 @@ namespace Edu.Repository.OKR
             {
                 where += $@" and {nameof(RB_OKR_Objective_ViewModel.Status)} ={demodel.Status}";
             }
-
+            if (demodel.selectStatus > 0)
+            {
+                if (demodel.selectStatus==1)
+                {
+                    where += $@" and {nameof(RB_OKR_Objective_ViewModel.Status)} in (2,3)";
+                }
+            }
             string sql = $@" select * from RB_OKR_Objective where {where} order by Sort asc";
             return Get<RB_OKR_Objective_ViewModel>(sql).ToList();
         }