新增班级类型

Edu.Common/Enum/Course/CourseClassTypeEnum.cs

-using System;
-using System.Collections.Generic;
-using System.Text;
-using Edu.Common.Plugin;
+using Edu.Common.Plugin;
 
 namespace Edu.Common.Enum.Course
 {
     public enum CourseClassTypeEnum
     {
-       
         /// <summary>
         /// 一对一外教
         /// </summary>

Edu.Common/Enum/Course/StudentNumTypeEnum.cs

@@ -18,4 +18,28 @@ namespace Edu.Common.Enum.Course
         [EnumField("多人")]
         OneToMany = 2
     }
+
+    /// <summary>
+    /// 班级分类
+    /// </summary>
+    public enum ClassCategoryEnum
+    {
+        /// <summary>
+        /// 常规
+        /// </summary>
+        [EnumField("常规")]
+        Normal = 1,
+
+        /// <summary>
+        /// 宣讲
+        /// </summary>
+        [EnumField("宣讲")]
+        Lecture = 2,
+
+        /// <summary>
+        /// 日语角
+        /// </summary>
+        [EnumField("日语角")]
+        JapaneseCorner = 3,
+    }
 }

Edu.Model/Entity/Grade/RB_Class.cs

@@ -234,5 +234,10 @@ namespace Edu.Model.Entity.Grade
         /// 滚动开班月份
         /// </summary>
         public string ScrollMonth { get; set; }
+
+        /// <summary>
+        /// 班级分类
+        /// </summary>
+        public ClassCategoryEnum ClassCategory { get; set; }
     }
 }

Edu.Module.Course/ClassModule.cs

@@ -406,7 +406,7 @@ namespace Edu.Module.Course
         /// <param name="rowsCount">总条数</param>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public List<RB_Class_Log_ViewModel> GetClassLogPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_Log_ViewModel query)
+        public List<RB_Class_Log_ViewModel> GetClassLogPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Class_Log_ViewModel query)
         {
             return classLogRepository.GetClassLogPageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
@@ -457,6 +457,7 @@ namespace Edu.Module.Course
                     { nameof(RB_Class_ViewModel.CourseClassType),model.CourseClassType},
                     { nameof(RB_Class_ViewModel.StudentNumType),model.StudentNumType},
                     { nameof(RB_Class_ViewModel.ClassHourMinute),model.ClassHourMinute},
+                    { nameof(RB_Class_ViewModel.ClassCategory),model.ClassCategory},
                 };
                 if (oldModel.OpenTime != model.OpenTime || oldModel.ClassType != model.ClassType || string.IsNullOrEmpty(oldModel.ClassNo))
                 {

Edu.Repository/Grade/RB_ClassRepository.cs

@@ -383,7 +383,8 @@ WHERE 1=1
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), 0);
             builder.AppendFormat(" AND A.{0} in(1,2) ", nameof(RB_Class_ViewModel.ClassStatus));
-            builder.AppendFormat(" AND B.Saleplat<>'' AND B.SaleState=1 AND B.Status=0 ");
+            //显示的课程
+            builder.AppendFormat(" AND B.SaleState=1 AND B.Status=0 ");
             if (query != null)
             {
                 if (query.Group_Id > 0)

Edu.Repository/Grade/RB_Class_TypeRepository.cs

 using Edu.Common.Enum;
-using Edu.Model.Entity.Course;
 using Edu.Model.Entity.Grade;
-using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Grade;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -22,6 +22,7 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Spire.Pdf.Exporting.XPS.Schema;
 
 namespace Edu.WebApi.Controllers.Course
 {
@@ -102,6 +103,8 @@ namespace Edu.WebApi.Controllers.Course
                     item.TotalPlanNum,
                     item.CourseSubject,
                     item.CourseSubjectName,
+                    item.ClassCategory,
+                    ClassCategoryName = item.ClassCategory.ToName(),
                 });
             }
             pageModel.Count = rowsCount;
@@ -244,6 +247,7 @@ namespace Edu.WebApi.Controllers.Course
                 CourseClassType = (CourseClassTypeEnum)base.ParmJObj.GetInt("CourseClassType"),
                 StudentNumType = (StudentNumTypeEnum)base.ParmJObj.GetInt("StudentNumType"),
                 ClassHourMinute = base.ParmJObj.GetInt("ClassHourMinute"),
+                ClassCategory=(ClassCategoryEnum)base.ParmJObj.GetInt("ClassCategory"),
             };
 
             extModel.ClassDateList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ClassDateList"));
@@ -672,6 +676,7 @@ namespace Edu.WebApi.Controllers.Course
                 ClassDateList = extModel?.ClassDateList ?? new List<string>(),
                 TotalPlanNum = extModel?.TotalPlanNum ?? 0,
                 UsePlanNum = extModel?.UsePlanNum ?? 0,
+                ClassCategory= extModel?.ClassCategory??0,
             };
             return ApiResult.Success(data: obj);
         }
@@ -1296,6 +1301,70 @@ namespace Edu.WebApi.Controllers.Course
             return result ? ApiResult.Success(message: "check_success") : ApiResult.Failed("签到失败");
         }
 
+        /// <summary>
+        /// 讲座和日语角签到
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult AddClassCheckOtherType()
+        {
+            int ClassId = base.ParmJObj.GetInt("ClassId");
+            int ClassPlanId = base.ParmJObj.GetInt("ClassPlanId");
+            int ClassTimeId = base.ParmJObj.GetInt("ClassTimeId");
+            if (ClassId <= 0 || ClassPlanId <= 0 || ClassTimeId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "参数不能为空!");
+            }
+            var userInfo = base.UserInfo;
+            var planModel = classModule.GetClassPlanListModule(new RB_Class_Plan_ViewModel() { ClassPlanId = ClassPlanId }).FirstOrDefault();
+            //判断当天是否有已签到数据
+            var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel
+            {
+                Group_Id = userInfo.Group_Id,
+                ClassId = ClassId,
+                ClassTimeId = ClassTimeId,
+                StartDate = planModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                EndDate = planModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
+            });
+            var classTime = classModule.GetClassTimeListModule(new RB_Class_Time_ViewModel() { ClassId = ClassId, ClassPlanId = ClassPlanId, ClassTimeId = ClassTimeId })?.FirstOrDefault();
+            List<RB_Class_Check_ViewModel> list = new List<RB_Class_Check_ViewModel>();
+            list.Add(new RB_Class_Check_ViewModel()
+            {
+                CheckStatus = 0,
+                ClassDate = planModel.ClassDate,
+                ClassRoomId = planModel.ClassRoomId,
+                OrderGuestId = 0,
+                School_Id = 0,
+                StudyNum = (classTime?.TimeMinute ?? 0),
+                TeacherId = planModel.TeacherId,
+                ClassId = ClassId,
+                ClassTimeId = ClassTimeId,
+                StuId = 0
+            });
+            foreach (var item in list)
+            {
+                var signModel = checkLogList?.Where(qitem => qitem.ClassDate.ToString("yyyy-MM-dd") == item.ClassDate.ToString("yyyy-MM-dd") && qitem.ClassId == item.ClassId
+                && qitem.ClassTimeId == item.ClassTimeId)?.FirstOrDefault();
+                if (signModel != null && signModel.ClassCheckId > 0)
+                {
+                    item.ClassCheckId = signModel.ClassCheckId;
+                    item.Group_Id = signModel.Group_Id;
+                    item.CreateTime = signModel.CreateTime;
+                    item.CreateBy = userInfo.Id;
+                    item.Status = 0;
+                }
+                else
+                {
+                    item.Group_Id = userInfo.Group_Id;
+                    item.CreateTime = System.DateTime.Now;
+                    item.CreateBy = userInfo.Id;
+                    item.Status = 0;
+                }
+            }
+            bool result = classModule.AddClassCheckModule(list).Result;
+            return result ? ApiResult.Success() : ApiResult.Failed("签到失败");
+        }
+
         ///// <summary>
         ///// 视频转码回调
         ///// </summary>
@@ -1502,7 +1571,7 @@ namespace Edu.WebApi.Controllers.Course
                 ClassId = base.ParmJObj.GetInt("ClassId"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
-            var list = classModule.GetClassLogPageListRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            var list = classModule.GetClassLogPageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
                 if (item.CreateBy > 0)
@@ -1555,6 +1624,25 @@ namespace Edu.WebApi.Controllers.Course
             }
             return ApiResult.Success(data: list.OrderBy(qitem => qitem.Id));
         }
+
+        /// <summary>
+        /// 获取班级分类枚举列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassCategoryList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(ClassCategoryEnum));
+            if (list != null)
+            {
+                list.Insert(0, new EnumItem()
+                {
+                    Id = 0,
+                    Name = "不限"
+                });
+            }
+            return ApiResult.Success(data: list.OrderBy(qitem => qitem.Id));
+        }
         #endregion
 
         #region 老师教案