Skip to content

E
Education
Commit f51bceca authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 28b2ddb2
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 49 deletions
Edu.Model/ViewModel/Exam/ExaminationPaperTreeModel.cs
View file @ f51bceca
......@@ -28,7 +28,7 @@ namespace Edu.Model.ViewModel.Exam
/// <summary>
/// 难易程度(1-易，2-中，3-难)
/// </summary>
public DifficultyTypeEnum DifficultyType { get; set; }
public string DifficultyTypeName { get; set; }
/// <summary>
/// 创建人
......
Edu.Model/ViewModel/Exam/RB_Examination_Details_ViewModel.cs
View file @ f51bceca
......@@ -19,5 +19,10 @@ namespace Edu.Model.ViewModel.Exam
/// 显示标题
/// </summary>
public string ShowTitle { get; set; }
/// <summary>
/// 选项
/// </summary>
public object QuestionContentObj { get; set; }
}
}
Edu.Module.Course/ClassModule.cs
View file @ f51bceca
......@@ -167,24 +167,7 @@ namespace Edu.Module.Course
/// 日志仓储对象
/// </summary>
private readonly RB_User_ChangeLogRepository user_ChangeLogRepository = new RB_User_ChangeLogRepository();
/// <summary>
/// 小程序对应的商品仓储对象
/// </summary>
private readonly Repository.Mall.RB_GoodsRepository mallGoodsRepository = new Repository.Mall.RB_GoodsRepository();
/// <summary>
/// 小程序对应的商品分类仓储对象
/// </summary>
private readonly Repository.Mall.RB_Goods_CategoryRepository MallGoodsCategoryRepository = new Repository.Mall.RB_Goods_CategoryRepository();
/// <summary>
/// 小程序对应的商品优惠仓储对象
/// </summary>
private readonly Repository.Mall.RB_Goods_PreferentialRepository MallGoodsPreferentialRepository = new Repository.Mall.RB_Goods_PreferentialRepository();
/// <summary>
/// 商品规格
/// </summary>
......@@ -203,11 +186,6 @@ namespace Edu.Module.Course
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 课程章节仓储层对象
/// </summary>
private readonly RB_Course_ChapterRepository chapterRepository = new RB_Course_ChapterRepository();
/// <summary>
/// 获取班级列表
/// </summary>
......@@ -4370,19 +4348,23 @@ namespace Edu.Module.Course
{
if (courseModel.SalePlatList != null && courseModel.SalePlatList.Any(x => x == 4) && model.ClassStatus == ClassStatusEnum.NonOpenClass)//课程关联到了小程序
{
Model.ViewModel.Mall.RB_Goods_Extend demodel = new Model.ViewModel.Mall.RB_Goods_Extend();
demodel.MallBaseId = Convert.ToInt32(Config.JHMallBaseId);
demodel.TenantId = Convert.ToInt32(Config.JHTenantId);
demodel.SpecificationList = new List<RB_Goods_Specification_Extend>();
demodel.SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>();
demodel.Id = courseModel.MallGoodsId;
demodel.CreateDate = System.DateTime.Now;
RB_Goods_Specification_Extend modelSpecification = new RB_Goods_Specification_Extend();
modelSpecification.Id = 0;//暂定
modelSpecification.EnabledImage = 2;
modelSpecification.Name = "开班日期";
modelSpecification.Sort = 1;
modelSpecification.SpecificationValueList = new List<RB_Goods_SpecificationValue_Extend>();
RB_Goods_Extend demodel = new RB_Goods_Extend
{
MallBaseId = Convert.ToInt32(Config.JHMallBaseId),
TenantId = Convert.ToInt32(Config.JHTenantId),
SpecificationList = new List<RB_Goods_Specification_Extend>(),
SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>(),
Id = courseModel.MallGoodsId,
CreateDate = DateTime.Now
};
RB_Goods_Specification_Extend modelSpecification = new RB_Goods_Specification_Extend
{
Id = 0,//暂定
EnabledImage = 2,
Name = "开班日期",
Sort = 1,
SpecificationValueList = new List<RB_Goods_SpecificationValue_Extend>()
};
//查询课程对应班级开课时间大于今天的班级
var classList = classRepository.GetClassAndCourseListRepository(new RB_Class_ViewModel { CouseId = model.CouseId, StartTime = System.DateTime.Now.ToString("yyyy-MM-dd") }).Where(x => x.ClassStatus == Common.Enum.Course.ClassStatusEnum.NonOpenClass && x.OpenTime > System.DateTime.Now).ToList();
if (classList != null && classList.Any())
......@@ -4390,15 +4372,16 @@ namespace Edu.Module.Course
int Sort = 1;
foreach (var item in classList)
{
RB_Goods_SpecificationValue_Extend modelSpecificationValue = new RB_Goods_SpecificationValue_Extend();
modelSpecificationValue.Id = 0;
modelSpecificationValue.Image = "";
modelSpecificationValue.ImagePath = "";
modelSpecificationValue.Name = item.OpenTime.ToString("MM月dd日");
modelSpecificationValue.Sort = Sort;///暂定1
modelSpecificationValue.ClassId = item.ClassId;
RB_Goods_SpecificationValue_Extend modelSpecificationValue = new RB_Goods_SpecificationValue_Extend
{
Id = 0,
Image = "",
ImagePath = "",
Name = item.OpenTime.ToString("MM月dd日"),
Sort = Sort,///暂定1
ClassId = item.ClassId
};
modelSpecification.SpecificationValueList.Add(modelSpecificationValue);
RB_Goods_SpecificationPrice_Extend pModel = new RB_Goods_SpecificationPrice_Extend()
{
Commission = 0,
......
Edu.Module.Exam/Edu.Module.Exam.csproj
View file @ f51bceca
......@@ -9,6 +9,7 @@
<ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" />
<ProjectReference Include="..\Edu.Common\Edu.Common.csproj" />
<ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
<ProjectReference Include="..\Edu.Module.Question\Edu.Module.Question.csproj" />
<ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />
</ItemGroup>
......
Edu.Module.Exam/PaperModule.cs
View file @ f51bceca
......@@ -7,6 +7,8 @@ using VT.FW.DB;
using System.Linq;
using System.Text.RegularExpressions;
using Edu.Cache.User;
using Edu.Common.Plugin;
using Edu.Module.Question;
namespace Edu.Module.Exam
{
......@@ -30,6 +32,11 @@ namespace Edu.Module.Exam
/// </summary>
private readonly RB_Examination_GroupRepository examination_GroupRepository = new RB_Examination_GroupRepository();
/// <summary>
/// 问题解析处理类
/// </summary>
private readonly AnalysisQuestionTypeModule analysisQuestion = new AnalysisQuestionTypeModule();
/// <summary>
/// 获取试卷分页列表
/// </summary>
......@@ -57,7 +64,7 @@ namespace Edu.Module.Exam
PaperId = item.PaperId,
PaperName = item.PaperName,
QuestionBandIds = item.QuestionBandIds,
DifficultyType = item.DifficultyType,
DifficultyTypeName = item.DifficultyType.ToName(),
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName??"",
PublishCount = item.PublishCount,
......@@ -96,7 +103,7 @@ namespace Edu.Module.Exam
PaperId = childItem.PaperId,
PaperName = childItem.PaperName,
QuestionBandIds = childItem.QuestionBandIds,
DifficultyType = childItem.DifficultyType,
DifficultyTypeName = childItem.DifficultyType.ToName(),
CreateTimeStr = Common.ConvertHelper.FormatTime(childItem.CreateTime),
CreateByName = UserReidsCache.GetUserLoginInfo(childItem.CreateBy)?.AccountName ?? "",
PublishCount = childItem.PublishCount,
......@@ -134,8 +141,6 @@ namespace Edu.Module.Exam
return examination_DetailsRepository.GetExaminationDetailsListRepository(query);
}
/// <summary>
/// 新增/修改试卷
/// </summary>
......@@ -284,6 +289,7 @@ namespace Edu.Module.Exam
{
foreach (var sItem in gItem.DetailsList)
{
sItem.QuestionContentObj = analysisQuestion.ParsingQuestion(sItem.QuestionTypeKey, sItem.QuestionContent);
string newTitle = sItem.Title;
try
{
......
Edu.WebApi/Controllers/Exam/ExamController.cs
View file @ f51bceca
......@@ -57,6 +57,7 @@ namespace Edu.WebApi.Controllers.Exam
item.QuestionCount,
item.ParentId,
item.PaperType,
item.DifficultyTypeName,
item.ChildList,
});
}
......
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