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

Edu.Module.Course/ClassModule.cs

@@ -7,6 +7,7 @@ using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.Reserve;
 using Edu.Model.ViewModel.User;
 using Edu.Repository.Course;
+using Edu.Repository.Finance;
 using Edu.Repository.Log;
 using Edu.Repository.Reserve;
 using Edu.Repository.User;
@@ -96,6 +97,10 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Class_ConfigRepository class_ConfigRepository = new RB_Class_ConfigRepository();
 
+        /// <summary>
+        /// 教育月结轧账
+        /// </summary>
+        private readonly RB_RollingAccountRepository rollingAccountRepository = new RB_RollingAccountRepository();
 
         /// <summary>
         /// 课程基础配置
@@ -3170,5 +3175,29 @@ namespace Edu.Module.Course
         }
         #endregion
 
+
+        #region 财务轧账
+        /// <summary>
+        /// 验证是否可以修改签到数据
+        /// </summary>
+        /// <param name="monthStr"></param>
+        /// <param name="schoolId"></param>
+        /// <param name="group_Id"></param>
+        /// <returns></returns>
+        public string ValidateClassCheckFinance(string monthStr, int schoolId, int group_Id)
+        {
+            var ralist = rollingAccountRepository.GetList(new Model.ViewModel.Finance.RB_RollingAccount_Extend() { GroupId = group_Id, Month = monthStr, State = 1 });
+            if (ralist.Any())
+            {
+                if (ralist.Where(x => x.SchoolIds == "-1" || ("," + x.SchoolIds + ",").Contains("," + schoolId + ",")).Any())
+                {
+                    return "该单据所在交易日期已关帐,无法修改签到数据";
+                }
+            }
+            return "";
+        }
+
+        #endregion
+
     }
 }

Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs

@@ -464,7 +464,7 @@ WHERE 1=1
                                       new Model.Entity.Log.RB_Class_Log()
                                       {
                                           LogType = Common.Enum.Course.ClassLogTypeEnum.Class,
-                                          LogContent = "从" + allChangePlanModel.OpenTimeStr + "开始重新排课",
+                                          LogContent = "从" + allChangePlanModel.OpenTimeStr + "开始" + (Common.Plugin.EnumHelper.ToName(allChangePlanModel.ClassStyle)),
                                           ClassId = model.ClassId,
                                           Group_Id = model.Group_Id,
                                           School_Id = model.School_Id,

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -912,6 +912,15 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.ParamIsNull(message: "请选择签到学员!");
             }
+            #region 验证是否已轧账
+            string MonthStr = list.FirstOrDefault().ClassDate.ToString("yyyy-MM");
+            int schoolId = list.FirstOrDefault().School_Id;
+            string ValidateMsg = classModule.ValidateClassCheckFinance(MonthStr, schoolId, base.UserInfo.Group_Id);
+            if (ValidateMsg != "") {
+                return ApiResult.Failed(ValidateMsg);
+            }
+            #endregion
+
             //获取班级的学员信息
             var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, QEffectStatus = 1 });
             if (list.Count() != orderGuestList.Where(x => x.GuestState == 1).Count())

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

@@ -48,6 +48,7 @@ namespace Edu.WebApi.Controllers.EduTask
                 ChangeType = base.ParmJObj.GetInt("ChangeType"),
                 MoveType = base.ParmJObj.GetInt("MoveType"),
             };
+            var classModel = classModule.GetClassModule(model.ClassId);
             try
             {
                 if (model.MoveType == 1)
@@ -238,7 +239,7 @@ namespace Edu.WebApi.Controllers.EduTask
                     {
                         return ApiResult.Failed("请输入排课信息");
                     }
-                    var classModel = classModule.GetClassModule(model.ClassId);
+                  
                     if (classModel != null && classModel.ClassId > 0)
                     {  //获取课时分钟数
                         model.AllChangePlanModel.ClassHourMinute = classModel?.ClassHourMinute ?? 0;
@@ -304,7 +305,7 @@ namespace Edu.WebApi.Controllers.EduTask
                 model.CreateBy = base.UserInfo.Id;
                 model.CreateTime = DateTime.Now;
                 model.Group_Id = base.UserInfo.Group_Id;
-                model.School_Id = base.UserInfo.School_Id;
+                model.School_Id = classModel.School_Id;
             }
             model.UpdateBy = base.UserInfo.Id;
             model.UpdateTime = DateTime.Now;