页面修改

Edu.Model/ViewModel/Course/RB_Course_Words_Extend.cs

@@ -10,6 +10,9 @@ namespace Edu.Model.ViewModel.Course
     /// </summary>
     public class RB_Course_Words_Extend : RB_Course_Words
     {
-
+        /// <summary>
+        /// 课程编号
+        /// </summary>
+        public string QCourseIds { get; set; }
     }
 }

Edu.Module.Course/CourseModule.cs

@@ -145,6 +145,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly Repository.Mall.RB_Goods_SpecificationPriceRepository goods_SpecificationPriceRepository = new Repository.Mall.RB_Goods_SpecificationPriceRepository();
 
+        /// <summary>
+        /// 课程单词仓储层对象
+        /// </summary>
+        private readonly RB_Course_WordsRepository course_WordsRepository = new RB_Course_WordsRepository();
+
         #region 课程管理
 
         public List<RB_Course_ViewModel> GetAllCourseChapterCountModule(int groupId, int courseId)
@@ -481,6 +486,11 @@ namespace Edu.Module.Course
             return chapterRepository.GetChapterListRepository(query);
         }
 
+        /// <summary>
+        /// 导入课程章节到新课程
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
         public List<ChapterTree_ViewModel> SetImportChapterModule(RB_Course_Chapter_ViewModel query)
         {
             var result = GetChapterTreeListModule(query);
@@ -652,6 +662,11 @@ namespace Edu.Module.Course
             return resultList;
         }
 
+        /// <summary>
+        /// 批量导入课程章节信息
+        /// </summary>
+        /// <param name="courseId"></param>
+        /// <returns></returns>
         public bool SetBatchAllChapterCurrentHoursModule(int courseId)
         {
             RB_Course_Chapter_ViewModel query = new RB_Course_Chapter_ViewModel()
@@ -712,8 +727,6 @@ namespace Edu.Module.Course
                     }
                 }
             });
-
-
             return chapterRepository.SetBatchCurrentHoursRepository(list);
         }
 
@@ -807,7 +820,6 @@ namespace Edu.Module.Course
             }
         }
 
-
         /// <summary>
         /// 获取章节实体类
         /// </summary>
@@ -841,7 +853,6 @@ namespace Edu.Module.Course
         public bool BatchRemoveChapterModule(RB_Course_Chapter_ViewModel model)
         {
             var flag = chapterRepository.DeleteBatchChpterRepository(model);
-
             SetBatchAllChapterCurrentHoursModule(model.CourseId);
             return flag;
         }
@@ -896,8 +907,6 @@ namespace Edu.Module.Course
         public bool SetBatchChapterNoModule(List<RB_Course_Chapter_ViewModel> chapters)
         {
             var flag = chapterRepository.SetBatchUpdateChapterNoRepository(chapters);
-
-            //SetBatchAllChapterCurrentHoursModule(chapters[0].CourseId);
             return flag;
         }
 
@@ -1611,7 +1620,6 @@ namespace Edu.Module.Course
         public List<RB_Class_Time_UnKnowUser_ViewModel> GetUnKnowUserByClassTimeModule(int classId)
         {
             var list = unKnowRepository.GetUnKnowUsersByClassIdRepository(classId);
-
             return list;
         }
 
@@ -1714,6 +1722,7 @@ namespace Edu.Module.Course
             demodel.GoodsPageType ??= GoodsPageTypeEnum.All;
             demodel.TenantId = Convert.ToInt32(Config.JHTenantId);
             demodel.MallBaseId = Convert.ToInt32(Config.JHMallBaseId);
+
             #region 商品规格信息
             demodel.SpecificationList = new List<RB_Goods_Specification_Extend>();
             demodel.SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>();
@@ -1762,7 +1771,6 @@ namespace Edu.Module.Course
             demodel.SpecificationList.Add(modelSpecification);
             #endregion
 
-
             if (demodel.Id == 0)//已存在，更新
             {
                 demodel.Status = 0;
@@ -1772,7 +1780,6 @@ namespace Edu.Module.Course
 
                 if (goodsId > 0)
                 {
-
                     //插入分类
                     foreach (var item in model.CategoryList)
                     {
@@ -1793,7 +1800,8 @@ namespace Edu.Module.Course
             else
             {
                 //修改
-                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() 
+                {
                     { nameof(RB_Goods.Name),demodel.Name},
                     { nameof(RB_Goods.CarouselImage),demodel.CarouselImage},
                     { nameof(RB_Goods.VideoAddress),demodel.VideoAddress},
@@ -1861,18 +1869,22 @@ namespace Edu.Module.Course
                     { nameof(RB_Goods.GoodsUrl),demodel.GoodsUrl },
                     { nameof(RB_Goods.goodsLogo),demodel.goodsLogo },
                 };
-                List<WhereHelper> wheres = new List<WhereHelper>() {
-                        new WhereHelper(){
+                List<WhereHelper> wheres = new List<WhereHelper>()
+                {
+                    new WhereHelper()
+                    {
                         FiledName=nameof(RB_Goods.Id),
                         FiledValue=demodel.Id,
                         OperatorEnum=OperatorEnum.Equal
                     },
-                        new WhereHelper(){
+                    new WhereHelper()
+                    {
                         FiledName=nameof(RB_Goods.TenantId),
                         FiledValue=demodel.TenantId,
                         OperatorEnum=OperatorEnum.Equal
                     },
-                        new WhereHelper(){
+                    new WhereHelper()
+                    {
                         FiledName=nameof(RB_Goods.MallBaseId),
                         FiledValue=demodel.MallBaseId,
                         OperatorEnum=OperatorEnum.Equal
@@ -1900,7 +1912,6 @@ namespace Edu.Module.Course
                     }
                     #endregion
 
-
                     #region 修改分类
                     var clist = MallGoodsCategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsId = demodel.Id, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
                     var insertList = model.CategoryList.Where(x => !clist.Select(y => y.CategoryId).Contains(x.CategoryId)).ToList();
@@ -2062,7 +2073,6 @@ namespace Edu.Module.Course
             }
             #endregion
 
-
             return goodsId;
         }
 
@@ -2075,7 +2085,6 @@ namespace Edu.Module.Course
         public bool UpdateMallGoodsPrice(RB_Course_ViewModel courseModel, List<RB_Course_Preferential_Extend> list)
         {
             bool flag = false;
-
             if (courseModel.MallGoodsId > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -2165,7 +2174,6 @@ namespace Edu.Module.Course
                     }
                 }
             }
-           
             return flag;
         }
 

Edu.Repository/Course/RB_Course_WordsRepository.cs

@@ -37,6 +37,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Words_Extend.CourseId), query.CourseId);
                 }
+                if (!string.IsNullOrEmpty(query.QCourseIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_Words_Extend.CourseId), query.QCourseIds);
+                }
             }
             return Get<RB_Course_Words_Extend>(builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -582,10 +582,19 @@ namespace Edu.WebApi.Controllers.Course
 
         #region 课程章节管理
 
+        /// <summary>
+        /// 导入课程章节到新课程
+        /// </summary>
+        /// <returns></returns>
         [HttpPost]
         public ApiResult SetImportCourseChapter()
         {
-            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Course_Chapter_ViewModel>(RequestParm.Msg.ToString());
+            var query = new RB_Course_Chapter_ViewModel()
+            {
+                CourseIds = base.ParmJObj.GetStringValue("CourseIds"),
+                NewCourseId = base.ParmJObj.GetInt("NewCourseId"),
+                MaxLength = base.ParmJObj.GetInt("MaxLength")
+            };
             query.Group_Id = base.UserInfo.Group_Id;
             query.School_Id = base.UserInfo.School_Id;
             query.CreateBy = base.UserInfo.Id;