新增字段

Edu.Model/Entity/User/RB_Teacher_Static.cs

@@ -244,5 +244,10 @@ namespace Edu.Model.Entity.User
         /// 创建时间
         /// </summary>
         public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 活动次数
+        /// </summary>
+        public decimal ActivityNum { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/ScrollClassCommonModule.cs

@@ -654,26 +654,33 @@ namespace Edu.Module.Course
                 string orderGuestIds = string.Join(",", list.Select(x => x.GuestId).Distinct());
                 var oldCheck = class_CheckRepository.GetClassCheckList(new RB_Class_Check_ViewModel() { Group_Id = groupId, StartDate = Date, EndDate = Date, QOrderGuestIds = orderGuestIds });
 
-                foreach (var item in list) {
+                foreach (var item in list)
+                {
                     //更新约课为已上课
-                    Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    Dictionary<string, object> keyValues = new Dictionary<string, object>() 
+                    {
                         { nameof(RB_Scroll_Appointment_ViewModel.State), Common.Enum.Course.CourseAppointStateEnum.Coursed}
                     };
-                    List<WhereHelper> wheres = new List<WhereHelper>() {
-                        new WhereHelper(){
+                    List<WhereHelper> wheres = new List<WhereHelper>() 
+                    {
+                        new WhereHelper()
+                        {
                              FiledName = nameof(RB_Scroll_Appointment_ViewModel.Id),
-                              FiledValue = item.Id,
-                               OperatorEnum =OperatorEnum.Equal
+                             FiledValue = item.Id,
+                             OperatorEnum =OperatorEnum.Equal
                         }
                     };
                     bool flag = scroll_AppointmentRepository.Update(keyValues, wheres);
-                    if (flag) {
+                    if (flag) 
+                    {
                         var clist = JsonHelper.DeserializeObject<List<CourseTimeModel>>(item.CourseTime);
                         //更新 order_guest 表 上课章节  请假也暂时先算完成课时(请假应该是有补课的)
                         var gmodel = order_GuestRepository.GetEntity(item.GuestId);
-                        if (gmodel != null && gmodel.CourseChapterNo < item.ChapterNo) {
+                        if (gmodel != null && gmodel.CourseChapterNo < item.ChapterNo)
+                        {
                             //ld 2022-03-08 修改为学员上课最大课时
-                            Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                            Dictionary<string, object> keyValues1 = new Dictionary<string, object>() 
+                            {
                                 { nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.CourseChapterNo), item.ChapterNo},
                                 { nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.CompleteHours), item.ChapterNo * clist.Sum(x=>x.ClassHours)}
                             };
@@ -682,11 +689,13 @@ namespace Edu.Module.Course
                                 //章节已上完了  修改为 毕业
                                 keyValues1.Add(nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.GuestState), Common.Enum.Course.GuestStateEnum.Graduate);
                             }
-                            List<WhereHelper> wheres1 = new List<WhereHelper>() {
-                                new WhereHelper(){
+                            List<WhereHelper> wheres1 = new List<WhereHelper>() 
+                            {
+                                new WhereHelper()
+                                {
                                      FiledName = nameof(Model.ViewModel.Sell.RB_Order_Guest_ViewModel.Id),
-                                      FiledValue = gmodel.Id,
-                                       OperatorEnum =OperatorEnum.Equal
+                                     FiledValue = gmodel.Id,
+                                     OperatorEnum =OperatorEnum.Equal
                                 }
                             };
                             order_GuestRepository.Update(keyValues1, wheres1);

Edu.WebApi/Controllers/User/TeacherStaticController.cs

@@ -86,6 +86,7 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn("N1课程时数"){ CellWidth=15},
                         new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
                         new ExcelColumn("学生小程序刷题时间"){ CellWidth=15},
+                        new ExcelColumn("活动次数"){ CellWidth=15},
                         new ExcelColumn("总分数"){ CellWidth=15},
                         new ExcelColumn("所有老师平均分数"){ CellWidth=15},
                         new ExcelColumn("分数差距"){ CellWidth=15},
@@ -117,6 +118,7 @@ namespace Edu.WebApi.Controllers.User
                     columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppTimeScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ActivityNum")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("TotalScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("AvgScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("ScoreGap")));
@@ -194,6 +196,7 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn("N1课程时数"){ CellWidth=15},
                         new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
                         new ExcelColumn("学生小程序刷题时间"){ CellWidth=15},
+                        new ExcelColumn("活动次数"){ CellWidth=15},
                         new ExcelColumn("总分数"){ CellWidth=15},
                         new ExcelColumn("所有老师平均分数"){ CellWidth=15},
                         new ExcelColumn("分数差距"){ CellWidth=15},
@@ -225,6 +228,7 @@ namespace Edu.WebApi.Controllers.User
                     columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppTimeScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ActivityNum")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("TotalScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("AvgScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("ScoreGap")));