页面修改

Edu.Module.Course/ClassModule.cs

@@ -4934,7 +4934,8 @@ namespace Edu.Module.Course
                 ReviewWord = ReviewNum,
                 ReviewCourseNo,
                 CourseId = courseId,
-                TotalScore
+                TotalScore,
+                ClassId=classId,
             };
         }
 

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -1218,7 +1218,8 @@ order by a.ClassDate desc limit 1";
         /// <returns></returns>
         public List<RB_Class_Plan_ViewModel> GetStudyClassPlanList(int classId, int groupId)
         {
-            string sql = $@"SELECT a.*,(select count(0) from rb_class_plan p where p.`Status`=0 and p.Group_Id ={groupId} and p.ClassId ={classId} and p.ClassDate < a.ClassDate) as LessonPlanNum
+            string sql = $@"
+SELECT a.*,(select count(0) from rb_class_plan p where p.`Status`=0 and p.Group_Id ={groupId} and p.ClassId ={classId} and p.ClassDate <= a.ClassDate) as LessonPlanNum
 FROM rb_class_plan as a 
 WHERE  a.`Status`=0 and a.Group_Id ={groupId} and a.ClassId ={classId} 
 and a.ClassDate <='{Common.ConvertHelper.FormatDate(DateTime.Now)} 23:59:59' 

Edu.WebApi/Controllers/Applet/AppletIndexController.cs

@@ -318,6 +318,7 @@ namespace Edu.WebApi.Controllers.Applet
                     NextCourseNo=0,
                     ReviewCourseNo=0,
                     CourseId=0,
+                    ClassId=0,
                 };
             }
 
@@ -481,7 +482,8 @@ namespace Edu.WebApi.Controllers.Applet
                     NextCourseNo=0,
                     ReviewWord = 0,
                     ReviewCourseNo=0,
-                    CourseId = CourseId
+                    CourseId = CourseId,
+                    ClassId= ClassId,
                 };
             }
 
@@ -553,7 +555,7 @@ namespace Edu.WebApi.Controllers.Applet
                 decimal StudyProgress = 0;
                 if (tempPrepWords != null && tempPrepWords.TotalNum > 0)
                 {
-                    StudyProgress = Math.Round(Convert.ToDecimal(tempPrepWords.StudyNum) / Convert.ToDecimal(tempPrepWords.TotalNum) * 100, 2); ;
+                    StudyProgress = (int)(Convert.ToDecimal(tempPrepWords.StudyNum) / Convert.ToDecimal(tempPrepWords.TotalNum) * 100);
                 }
                 int Num = 1;
                 RList.Add(new