Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.EducationCore/Helper/QuarzHelper.cs

@@ -77,7 +77,7 @@ namespace Edu.Education.Helper
                         {
                             LogHelper.Write("ClassId：" + qitem.ClassId);
                             string msg = teachingRewardsModule.SetTeachingPerfCreate(0, qitem);
-                            if (msg != null)
+                            if (msg != "")
                             {
                                 LogHelper.Write("CreateTeachingPerf【" + qitem.ClassId + "】：" + msg);
                             }

Edu.Repository/Course/RB_ClassRepository.cs

@@ -220,7 +220,8 @@ left join (SELECT ClassId, SUM(GuestNum) AS GuestNum FROM rb_order WHERE OrderSt
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), 0);
-            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassStatus), (int)Common.Enum.Course.ClassStatusEnum.NonOpenClass);
+            builder.AppendFormat(" AND A.{0} in(1,2) ", nameof(RB_Class_ViewModel.ClassStatus));
+            builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_ViewModel.EndOrderTime), DateTime.Now.ToString("yyyy-MM-dd"));
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -269,9 +270,9 @@ WHERE 1=1
                 if (query.Q_CanApply == 1)
                 {
                     builder.AppendFormat(" AND (IFNULL(A.ClassPersion,0)-IFNULL(t.GuestNum,0))>0 ");
-                    builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_ViewModel.EndOrderTime), DateTime.Now.ToString("yyyy-MM-dd"));
                 }
             }
+            builder.AppendFormat(" order by A.{0} asc", nameof(RB_Class_ViewModel.OpenTime));
             return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 

Edu.Repository/Course/RB_Teaching_PerfRepository.cs

@@ -160,7 +160,7 @@ where {where} order by p.Id desc";
                 where += $@" and p.{nameof(RB_Teaching_Perf.ConfirmDate)} <='{demodel.OPEndTime} 23:59:59'";
             }
 
-            string sql = $@" select p.*,t.TeacherName,t.TeacherIcon,c.ClassName from RB_Teaching_Perf p
+            string sql = $@" select p.*,t.TeacherName,t.TeacherHead as TeacherIcon,c.ClassName from RB_Teaching_Perf p
 left join rb_teacher t on p.TeacherId = t.TId
 left join rb_class c on p.ClassId = c.ClassId
 where {where} order by p.Id desc";

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -536,21 +536,21 @@ namespace Edu.WebApi.Controllers.Course
                 return ApiResult.ParamIsNull("");
             }
             //获取班级的学员信息
-            var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = list.FirstOrDefault().School_Id, ClassId = list.FirstOrDefault().ClassId });
+            var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId });
             if (list.Count() != orderGuestList.Where(x => x.GuestState == 1).Count())
             {
                 return ApiResult.Failed("签到总人数错误，请先检查信息");
             }
             //判断今天有课没有
 
-            var planList = classModule.GetClassPlanModelRepository(new RB_Class_Plan_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = list.FirstOrDefault().School_Id, ClassId = list.FirstOrDefault().ClassId });
+            var planList = classModule.GetClassPlanModelRepository(new RB_Class_Plan_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId });
             if (planList == null || !planList.Any())
             {
                 return ApiResult.Failed("今日无课程，无须签到");
             }
 
             //判断今天是否已签到
-            var checkLogList = classModule.GetClassCheckListRepository(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = list.FirstOrDefault().School_Id, ClassId = list.FirstOrDefault().ClassId, StartDate = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") });
+            var checkLogList = classModule.GetClassCheckListRepository(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, StartDate = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") });
             if (checkLogList != null && checkLogList.Any())
             {
                 return ApiResult.Failed("今日已签到，请勿重复操作");

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -77,6 +77,7 @@ namespace Edu.WebApi.Controllers.Course
                     z.WeekDay,
                     ClassDate = x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate ? z.ClassDate.ToString("yyyy-MM-dd") : ""
                 }),
+                x.SchoolName,
                 UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm:ss")
             });
             return ApiResult.Success("", pageModel);

Edu.WebApi/Controllers/User/UserController.cs

@@ -692,6 +692,7 @@ namespace Edu.WebApi.Controllers.User
                 qitem.Dept_Id,
                 qitem.AccountRemark,
                 qitem.Email,
+                EmAccountId = qitem.Id
             });
             return ApiResult.Success(data: pageModel);
         }