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

Edu.Model/Entity/EduTask/RB_Change_ClassPlan.cs

@@ -76,5 +76,10 @@ namespace Edu.Model.Entity.EduTask
         /// 目标数据
         /// </summary>
         public string TargetData { get; set; }
+
+        /// <summary>
+        /// 调课备注
+        /// </summary>
+        public string Remarks { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Sell_Commission_Details_ViewModel.cs

@@ -13,6 +13,12 @@ namespace Edu.Model.ViewModel.Course
         /// 用户名称
         /// </summary>
         public string UserName { get; set; }
+
+        /// <summary>
+        /// 用户ids
+        /// </summary>
+        public string UserIds { get; set; }
+
         /// <summary>
         /// 部门名称
         /// </summary>

Edu.Module.Course/TeachingRewardsModule.cs

@@ -341,7 +341,7 @@ namespace Edu.Module.Course
                 string teacherIds = string.Join(",", list.Select(x => x.TeacherIds));
                 var tlist = teacherRepository.GetTeacherListRepository(new RB_Teacher_ViewModel() { Group_Id = dmodel.Group_Id, QTIds = teacherIds });
                 //查询财务单据
-                var financeList = financeRepository.GetListSingle(new RB_Finance_Extend() { RB_Group_Id = dmodel.Group_Id, FinanceType = 2, OtherType = 39, ReFinanceIds = bonusIds, IsSelectNormal = 1 });
+                var financeList = financeRepository.GetListSingle(new RB_Finance_Extend() { RB_Group_Id = dmodel.Group_Id, FinanceType = 2, OtherType = 26, ReFinanceIds = bonusIds, IsSelectNormal = 1 });
                 foreach (var item in list)
                 {
                     item.TeacherList = new List<RB_Teaching_BonusDetail_ViewModel>();

Edu.Repository/Course/RB_Sell_Commission_DetailsRepository.cs

@@ -35,6 +35,10 @@ namespace Edu.Repository.Course
             {
                 where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} ={demodel.UserId}";
             }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.UserId)} in({demodel.UserIds})";
+            }
             if (demodel.ClassId > 0)
             {
                 where += $@" and r.{nameof(RB_Sell_Commission_Details_ViewModel.ClassId)} ={demodel.ClassId}";

Edu.WebApi/Controllers/Course/TeachingRewardsController.cs

@@ -248,7 +248,7 @@ namespace Edu.WebApi.Controllers.Course
             var userInfo = base.UserInfo;
             var dmodel = JsonHelper.DeserializeObject<RB_Teaching_BonusDetail_ViewModel>(RequestParm.Msg.ToString());
             dmodel.Group_Id = userInfo.Group_Id;
-            if (dmodel.BonusId <= 0)
+            if (dmodel.BonusId <= 0 && string.IsNullOrEmpty(dmodel.BonusIds))
             {
                 return ApiResult.ParamIsNull("请传递教师奖励id");
             }

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

@@ -47,6 +47,7 @@ namespace Edu.WebApi.Controllers.EduTask
                 CourseId = base.ParmJObj.GetInt("CourseId"),
                 ChangeType = base.ParmJObj.GetInt("ChangeType"),
                 MoveType = base.ParmJObj.GetInt("MoveType"),
+                Remarks = base.ParmJObj.GetStringValue("Remarks")
             };
             var classModel = classModule.GetClassModule(model.ClassId);
             try
@@ -73,14 +74,6 @@ namespace Edu.WebApi.Controllers.EduTask
                     {
                         return ApiResult.Failed("排课原次数与现有次数不一致");
                     }
-                    //foreach (var item in model.OldChangePlanItemList)
-                    //{
-                    //    var newChangePlanModel = model.NewChangePlanItemList.Where(x => x.ClassPlanId == item.ClassPlanId).FirstOrDefault();
-                    //    if (item.PlanTimeList.Count() != newChangePlanModel.PlanTimeList.Count())
-                    //    {
-                    //        return ApiResult.Failed(item.ClassDate.ToString("yyyy-MM-dd") + "号的排课原课时数与现有课时数不一致");
-                    //    }
-                    //}
                 }
                 else if (model.ChangeType == 2)
                 {