也没修过

Edu.Model/ViewModel/Grade/RB_Class_Plan_ViewModel.cs

@@ -157,6 +157,11 @@ namespace Edu.Model.ViewModel.Grade
         /// </summary>
         public object Ranks { get; set; }
 
+        /// <summary>
+        /// 完成计划数量
+        /// </summary>
+        public int FinishNum { get; set; }
+
 
         /// <summary>
         /// 总的上课次数

Edu.Module.Course/ClassModule.cs

@@ -3728,6 +3728,11 @@ namespace Edu.Module.Course
                         {
                             tempTimeGuestList.AddRange(tempGuestList.Where(qitem => qitem.ClassId == subItem.ClassId && subItem.ClassPlanId == qitem.ClassPlanId && (qitem.GuestState == GuestStateEnum.Normal || qitem.GuestState == GuestStateEnum.StopClassesApplyIng || ((qitem.GuestState == GuestStateEnum.StopClasses || qitem.GuestState == GuestStateEnum.Graduate) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= subItem.ClassDate))));
                         }
+                        int CompleteProgress = 0;
+                        if (subItem.TotalPlanNum > 0)
+                        {
+                            CompleteProgress = Convert.ToInt32((Convert.ToDecimal(subItem.FinishNum) / Convert.ToDecimal(subItem.TotalPlanNum)) * 100);
+                        }
                         subList.Add(new
                         {
                             ClassType = 1,
@@ -3736,7 +3741,7 @@ namespace Edu.Module.Course
                             subItem.CourseName,
                             subItem.RoomName,
                             subItem.TeacherName,
-                            subItem.CompleteProgress,
+                            CompleteProgress,
                             subItem.Ranks,
                             subItem.TotalPlanNum,
                             TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -580,22 +580,24 @@ where sog.Account_Id={query.StuId} and c.ClassStatus in(1,2) and c.`Status`=0 an
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.ClassPlanId,A.ClassId,A.ClassDate,A.ClassRoomId,A.ClassName,A.CourseName,A.CourseId,A.Teacher_Id,A.TeacherName,A.UserIcon,A.RoomName
-       ,SUM(A.minNum) AS ClassMinutes,MIN(A.StartTime) AS  StartTime,MAX(A.EndTime) AS EndTime,A.CompleteProgress,a.TotalPlanNum,
+       ,SUM(A.minNum) AS ClassMinutes,MIN(A.StartTime) AS  StartTime,MAX(A.EndTime) AS EndTime,A.CompleteProgress,a.TotalPlanNum,A.FinishNum,
 (SELECT COUNT(*)  from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(a.ClassDate,'%Y-%m-%d') and ClassId=a.ClassId) as Ranks
 FROM
 (
-SELECT A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseName,c.CourseId,B.Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(D.TeacherHead,'') AS UserIcon,E.RoomName
-     ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',F.StartTime), CONCAT('2020-12-16',' ',F.EndTime)) AS minNum,F.StartTime,F.EndTime,B.CompleteProgress,plan.TotalPlanNum  
+SELECT A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseName,c.CourseId,B.Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName
+      ,IFNULL(D.TeacherHead,'') AS UserIcon,E.RoomName,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',F.StartTime), CONCAT('2020-12-16',' ',F.EndTime)) AS minNum
+      ,F.StartTime,F.EndTime,B.CompleteProgress,plan.TotalPlanNum,finishPlan.TotalPlanNum AS FinishNum
 FROM  rb_class_plan AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
       LEFT JOIN rb_course AS C ON B.CouseId=C.CourseId
 	  LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
 	  LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
-    LEFT JOIN rb_class_time F on A.ClassPlanId = F.ClassPlanId
-LEFT JOIN ((SELECT ClassId,COUNT(*) as TotalPlanNum from rb_class_plan where `Status`=0  GROUP BY ClassId)) as plan on plan.ClassId=a.ClassId
+      LEFT JOIN rb_class_time F on A.ClassPlanId = F.ClassPlanId
+      LEFT JOIN (SELECT ClassId,COUNT(*) as TotalPlanNum from rb_class_plan where `Status`=0 AND ClassDate<='{1}'  GROUP BY ClassId) as finishPlan on finishPlan.ClassId=a.ClassId
+      LEFT JOIN (SELECT ClassId,COUNT(*) as TotalPlanNum from rb_class_plan where `Status`=0  GROUP BY ClassId) as plan on plan.ClassId=a.ClassId
 WHERE 1=1 AND A.`Status`=0 AND B.`Status`=0 {0}
 ) AS A
 GROUP BY A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId,A.CompleteProgress 
-", where.ToString());
+", where.ToString(),Common.ConvertHelper.FormatDate(DateTime.Now));
             return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
         }