Commit 0da6f1b6 authored by 黄奎's avatar 黄奎

页面修改

parent 79931969
...@@ -351,5 +351,10 @@ namespace Edu.Model.Entity.Course ...@@ -351,5 +351,10 @@ namespace Edu.Model.Entity.Course
/// 适配上课时段ID (滚动开班) /// 适配上课时段ID (滚动开班)
/// </summary> /// </summary>
public int CourseTimeId { get; set; } public int CourseTimeId { get; set; }
/// <summary>
/// 开发题库等级[多选,逗号分割]
/// </summary>
public string OpenBankLevel { get; set; }
} }
} }
\ No newline at end of file
...@@ -193,5 +193,15 @@ namespace Edu.Model.ViewModel.Course ...@@ -193,5 +193,15 @@ namespace Edu.Model.ViewModel.Course
/// 是否查询有上架(1-是) /// 是否查询有上架(1-是)
/// </summary> /// </summary>
public int IsQuerySalePlat { get; set; } public int IsQuerySalePlat { get; set; }
/// <summary>
/// 开放题库等级列表
/// </summary>
public List<int> OpenBankLevelList { get; set; }
/// <summary>
/// 开发题库名称
/// </summary>
public List<string> OpenBankLevelNameList { get; set; }
} }
} }
\ No newline at end of file
...@@ -19,6 +19,7 @@ using System.Linq; ...@@ -19,6 +19,7 @@ using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using VT.FW.DB; using VT.FW.DB;
using Edu.Repository.Grade; using Edu.Repository.Grade;
using Edu.Common.Enum.Question;
namespace Edu.Module.Course namespace Edu.Module.Course
{ {
...@@ -199,6 +200,7 @@ namespace Edu.Module.Course ...@@ -199,6 +200,7 @@ namespace Edu.Module.Course
} }
} }
var list = courseRepository.GetCoursePageListRepository(pageIndex, pageSize, out rowsCount, query); var list = courseRepository.GetCoursePageListRepository(pageIndex, pageSize, out rowsCount, query);
var bankTypeList=EnumHelper.EnumToList(typeof(LevelTypeEnum));
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
var ids = string.Join(",", list.Select(qitem => qitem.CourseId)); var ids = string.Join(",", list.Select(qitem => qitem.CourseId));
...@@ -219,6 +221,20 @@ namespace Edu.Module.Course ...@@ -219,6 +221,20 @@ namespace Edu.Module.Course
foreach (var item in list) foreach (var item in list)
{ {
item.OpenBankLevelList = new List<int>();
if (!string.IsNullOrEmpty(item.OpenBankLevel))
{
item.OpenBankLevelList = Common.ConvertHelper.StringToList(item.OpenBankLevel);
}
item.OpenBankLevelNameList = new List<string>();
if (item.OpenBankLevelList != null && item.OpenBankLevelList.Count > 0)
{
foreach (var bItem in item.OpenBankLevelList)
{
var tempBank = bankTypeList.Where(qitem => qitem.Id == bItem).FirstOrDefault();
item.OpenBankLevelNameList.Add(tempBank.Name);
}
}
item.PreferentialList = preferentialList?.Where(qitem => qitem.CourseId == item.CourseId)?.OrderBy(qitem => qitem.PriceDiscountType)?.ToList() ?? new List<RB_Course_Preferential_Extend>(); item.PreferentialList = preferentialList?.Where(qitem => qitem.CourseId == item.CourseId)?.OrderBy(qitem => qitem.PriceDiscountType)?.ToList() ?? new List<RB_Course_Preferential_Extend>();
item.TeacherList = new List<RB_Teacher_ViewModel>(); item.TeacherList = new List<RB_Teacher_ViewModel>();
if (item.TeacherIdList != null && item.TeacherIdList.Count > 0) if (item.TeacherIdList != null && item.TeacherIdList.Count > 0)
...@@ -264,6 +280,10 @@ namespace Edu.Module.Course ...@@ -264,6 +280,10 @@ namespace Edu.Module.Course
var clist = MallGoodsCategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsId = extModel.MallGoodsId, TenantId = Convert.ToInt32(Config.JHTenantId), MallBaseId = Convert.ToInt32(Config.JHMallBaseId) }); var clist = MallGoodsCategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsId = extModel.MallGoodsId, TenantId = Convert.ToInt32(Config.JHTenantId), MallBaseId = Convert.ToInt32(Config.JHMallBaseId) });
extModel.CategoryList = clist; extModel.CategoryList = clist;
} }
if (!string.IsNullOrEmpty(extModel.OpenBankLevel))
{
extModel.OpenBankLevelList = Common.ConvertHelper.StringToList(extModel.OpenBankLevel);
}
} }
return extModel; return extModel;
} }
...@@ -309,6 +329,7 @@ namespace Edu.Module.Course ...@@ -309,6 +329,7 @@ namespace Edu.Module.Course
{nameof(RB_Course_ViewModel.ScrollMinNum),model.ScrollMinNum }, {nameof(RB_Course_ViewModel.ScrollMinNum),model.ScrollMinNum },
{nameof(RB_Course_ViewModel.ScrollMaxNum),model.ScrollMaxNum }, {nameof(RB_Course_ViewModel.ScrollMaxNum),model.ScrollMaxNum },
{nameof(RB_Course_ViewModel.CourseTimeId),model.CourseTimeId }, {nameof(RB_Course_ViewModel.CourseTimeId),model.CourseTimeId },
{nameof(RB_Course_ViewModel.OpenBankLevel),model.OpenBankLevel },
}; };
flag = courseRepository.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), model.CourseId)); flag = courseRepository.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), model.CourseId));
} }
......
...@@ -438,6 +438,20 @@ namespace Edu.WebApi.Controllers.Course ...@@ -438,6 +438,20 @@ namespace Edu.WebApi.Controllers.Course
{ {
Common.Plugin.LogHelper.Write(ex, "SetCourse"); Common.Plugin.LogHelper.Write(ex, "SetCourse");
} }
List<int> BankLevelList = new List<int>();
string OpenBankLevelListStr = base.ParmJObj.GetStringValue("OpenBankLevelList");
if (!string.IsNullOrEmpty(OpenBankLevelListStr))
{
try
{
BankLevelList = JsonHelper.DeserializeObject<List<int>>(OpenBankLevelListStr);
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetCourse");
}
}
extModel.OpenBankLevel = JsonHelper.Serialize(BankLevelList);
extModel.CreateTime = DateTime.Now; extModel.CreateTime = DateTime.Now;
extModel.CreateBy = base.UserInfo.Id; extModel.CreateBy = base.UserInfo.Id;
extModel.UpdateBy = base.UserInfo.Id; extModel.UpdateBy = base.UserInfo.Id;
...@@ -453,8 +467,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -453,8 +467,10 @@ namespace Edu.WebApi.Controllers.Course
extModel.OriginalPrice = oldModel.OriginalPrice; extModel.OriginalPrice = oldModel.OriginalPrice;
} }
bool flag = courseModule.SetCourseModule(extModel, out int courseId); bool flag = courseModule.SetCourseModule(extModel, out int courseId);
if (flag) { if (flag)
if (extModel.IsScrollClass == 1) { {
if (extModel.IsScrollClass == 1)
{
try try
{ {
//创建当月虚拟班级 //创建当月虚拟班级
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment