接口修改

Edu.Model/ViewModel/OKR/RB_OKR_Objective_ViewModel.cs

@@ -39,6 +39,11 @@ namespace Edu.Model.ViewModel.OKR
         /// </summary>
         public int ParentId { get; set; }
 
+        /// <summary>
+        /// 期数s
+        /// </summary>
+        public string PeriodIds { get; set; }
+
         /// <summary>
         /// 对齐列表
         /// </summary>

Edu.Module.OKR/OKRPeriodModule.cs

@@ -4926,7 +4926,8 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value.ToString("yyyy-MM-dd")}' and {ru
                         {
                             item.Id,
                             item.EmployeeName,
-                            item.UserIcon
+                            item.UserIcon,
+                            PeriodIds = list?.Where(qitem=>qitem.CreateBy==item.Id)?.FirstOrDefault()?.PeriodIds??""
                         });
                     }
                 }

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -316,7 +316,7 @@ 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 CreateBy in ({v})";
+            string sql = $@" select CreateBy,GROUP_CONCAT( DISTINCT PeriodId) AS PeriodIds from RB_OKR_Objective WHERE Group_Id={group_Id} and `Status` =1 and CreateBy in ({v})";
             //HK 03-01修改
             if (periodId > 0)
             {