接口修改

Edu.Module.OKR/OKRPeriodModule.cs

@@ -4932,6 +4932,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
                 }
             }
             #endregion
+          
             return AuditList;
         }
 
@@ -5130,15 +5131,20 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
         {
             var model = oKR_ObjectiveRepository.GetEntity(objectiveId);
             if (model == null) { return "目标不存在"; }
-            if (model.Status != 3 && model.Status != 4) { return "非暂存/审核驳回状态，无法发起审核"; }
+            // HK 03-01注释
+            //if (model.Status != 3 && model.Status != 4) { 
+            //    return "非暂存/审核驳回状态，无法发起审核";
+            //}
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_OKR_Objective_ViewModel.Status), 1}
             };
-            List<WhereHelper> wheres = new List<WhereHelper>() {
-                new WhereHelper(){
+            List<WhereHelper> wheres = new List<WhereHelper>() 
+            {
+                new WhereHelper()
+                {
                      FiledName=nameof(RB_OKR_Objective_ViewModel.Id),
-                      FiledValue=objectiveId,
-                       OperatorEnum=OperatorEnum.Equal
+                     FiledValue=objectiveId,
+                     OperatorEnum=OperatorEnum.Equal
                 }
             };
             bool flag = oKR_ObjectiveRepository.Update(keyValues, wheres);

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -316,7 +316,13 @@ where {where} order by o.Sort asc";
         /// <returns></returns>
         public List<RB_OKR_Objective_ViewModel> GetOKRMyEmployeeAuditList(int group_Id, int periodId, string v)
         {
-            string sql = $@" select CreateBy from RB_OKR_Objective WHERE Group_Id={group_Id} and `Status` =1 and PeriodId ={periodId} and CreateBy in ({v}) GROUP BY CreateBy";
+            string sql = $@" select CreateBy from RB_OKR_Objective WHERE Group_Id={group_Id} and `Status` =1 and CreateBy in ({v})";
+            //HK 03-01修改
+            if (periodId > 0)
+            {
+                sql += $" and PeriodId ={periodId}";
+            }
+            sql += " GROUP BY CreateBy ";
             return Get<RB_OKR_Objective_ViewModel>(sql).ToList();
         }