okr 进度更新状态

Edu.Model/Entity/OKR/RB_OKR_Objective.cs

@@ -122,5 +122,10 @@ namespace Edu.Model.Entity.OKR
         /// 是否默认全部可见权限   1是  2否
         /// </summary>
         public int IsDefaultPermission { get; set; }
+
+        /// <summary>
+        /// 是否更新过进度状态   1是
+        /// </summary>
+        public int IsUpdated { get; set; }
     }
 }

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -564,9 +564,10 @@ where o.Group_Id ={group_Id} and o.PeriodId ={periodId} AND o.Status =2 and o.Pr
             string sql = $@" 
 select * from(
 select e.EmployeeId AS CreateBy,e.EmName,e.EmPhoto,e.DeptName,e.PostName,
-sum(case when o.ProgressState = 1 then 1 else 0 end) as ObjectiveNum1, 
-sum(case when o.ProgressState = 2 then 1 else 0 end) as ObjectiveNum2,
-sum(case when o.ProgressState = 3 then 1 else 0 end) as ObjectiveNum3 
+sum(case when o.IsUpdated <> 1 then 1 else 0 end) as ObjectiveNum1, 
+sum(case when o.IsUpdated = 1 and o.ProgressState = 1 then 1 else 0 end) as ObjectiveNum2, 
+sum(case when o.IsUpdated = 1 and o.ProgressState = 2 then 1 else 0 end) as ObjectiveNum3,
+sum(case when o.IsUpdated = 1 and o.ProgressState = 3 then 1 else 0 end) as ObjectiveNum4 
 from  rb_employee e
 LEFT JOIN RB_OKR_Objective o on e.EmployeeId = o.CreateBy and o.Group_Id ={group_Id} and o.PeriodId ={periodId} AND o.Status =2
 where e.RB_Group_id ={group_Id} and e.IsLeave =0 {(!string.IsNullOrEmpty(userIds) ? "and e.EmployeeId in (" + userIds + ")" : "")} group by e.EmployeeId
@@ -579,9 +580,10 @@ where e.RB_Group_id ={group_Id} and e.IsLeave =0 {(!string.IsNullOrEmpty(userIds
         {
             string sql = $@" 
 select e.RB_Department_Id,
-sum(case when o.ProgressState = 1 then 1 else 0 end) as ObjectiveNum1, 
-sum(case when o.ProgressState = 2 then 1 else 0 end) as ObjectiveNum2,
-sum(case when o.ProgressState = 3 then 1 else 0 end) as ObjectiveNum3 
+sum(case when o.IsUpdated <> 1 then 1 else 0 end) as ObjectiveNum1, 
+sum(case when o.IsUpdated = 1 and o.ProgressState = 1 then 1 else 0 end) as ObjectiveNum2, 
+sum(case when o.IsUpdated = 1 and o.ProgressState = 2 then 1 else 0 end) as ObjectiveNum3,
+sum(case when o.IsUpdated = 1 and o.ProgressState = 3 then 1 else 0 end) as ObjectiveNum4 
 from  rb_employee e
 LEFT JOIN RB_OKR_Objective o on e.EmployeeId = o.CreateBy and o.Group_Id ={group_Id} and o.PeriodId ={periodId} AND o.Status =2
 where e.RB_Group_id ={group_Id} and e.IsLeave =0 and e.RB_Department_Id in ({deptIds}) group by e.RB_Department_Id