Parcourir la source

完善培训模版

guqiang il y a 1 mois
Parent
commit
42ca55230a

+ 10 - 0
src/Hotline.Application/Exam/Service/Trains/TrainTemplateService.cs

@@ -416,6 +416,8 @@ namespace Hotline.Application.Exam.Service.Trains
             {
                 Id = t.Id,
                 QuestionId = t.QuestionId,
+                QuestionType = q.QuestionType,
+                DifficultyLevel = q.DifficultyLevel,                
                 Title = q.Title
             });
 
@@ -446,6 +448,8 @@ namespace Hotline.Application.Exam.Service.Trains
         {
             if (actionRequest.TrainPracticeDtos != null)
             {
+                actionRequest.TrainPracticeDtos.ResolveOperationStatus();
+
                 var trainPracticeDtos = actionRequest.TrainPracticeDtos.Where(x => x.OperationStatus == EEOperationStatus.Add).ToList();
 
                 var trainPractices = _mapper.Map<List<TrainPractice>>(trainPracticeDtos);
@@ -471,6 +475,8 @@ namespace Hotline.Application.Exam.Service.Trains
         {
             if (actionRequest.TrainKnowladges != null)
             {
+                actionRequest.TrainKnowladges.ResolveOperationStatus();
+
                 var trainKnowladgeDtos = actionRequest.TrainKnowladges.Where(x => x.OperationStatus == EEOperationStatus.Add).ToList();
 
                 var trainKnowladges = _mapper.Map<List<TrainKnowladge>>(trainKnowladgeDtos);
@@ -518,6 +524,8 @@ namespace Hotline.Application.Exam.Service.Trains
         {
             if (actionRequest.TrainPracticeDtos == null) return null;
 
+            actionRequest.TrainPracticeDtos.ResolveOperationStatus();
+
             var trainPracticeDtos = actionRequest.TrainPracticeDtos.Where(x => x.OperationStatus == EEOperationStatus.Update).ToList();
 
             var ids = trainPracticeDtos.Select(x => x.Id);
@@ -567,6 +575,8 @@ namespace Hotline.Application.Exam.Service.Trains
         {
             if (actionRequest.TrainKnowladges == null) return null;
 
+            actionRequest.TrainKnowladges.ResolveOperationStatus();
+
             var trainKnowladgeDtos = actionRequest.TrainKnowladges.Where(x => x.OperationStatus == EEOperationStatus.Update).ToList();
 
             var ids = trainKnowladgeDtos.Select(x => x.Id);

+ 30 - 5
src/Hotline.Share/Dtos/Trains/TrainPracticeDto.cs

@@ -1,6 +1,7 @@
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Data.Interface;
 using Exam.Infrastructure.Enums;
+using Exam.Infrastructure.Extensions;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Enums.Exams;
 using Hotline.Share.Exams.Interface;
@@ -13,7 +14,7 @@ namespace Hotline.Share.Dtos.Trains
     /// 培训习题
     /// </summary>
     [Description("培训习题")]
-    public class TrainPracticeDto:UpdateTrainPracticeDto
+    public class TrainPracticeDto : UpdateTrainPracticeDto
     {
         // <summary>
         /// 关联课件
@@ -32,9 +33,33 @@ namespace Hotline.Share.Dtos.Trains
         /// </summary>
         [Description("培训习题选项")]
         public List<SimpleTrainPracticeOptionsDto> TrainPracticeOptionsDtos { get; set; }
+
+        /// <summary>
+        /// 题型
+        /// </summary>
+        [Description("题型")]
+        public string QuestionTypeDesc
+        {
+            get
+            {
+                return QuestionType.GetDescription();
+            }
+        }
+
+        /// <summary>
+        /// 难度
+        /// </summary>
+        [Description("难度")]
+        public string DifficultyLevelDesc
+        {
+            get
+            {
+                return DifficultyLevel.GetDescription();
+            }
+        }
     }
 
-    public class AddTrainPracticeDto : IAddRequest,IOperationStatus
+    public class AddTrainPracticeDto : IAddRequest, IOperationStatus
     {
         /// <summary>
         /// 培训模版Id
@@ -71,9 +96,9 @@ namespace Hotline.Share.Dtos.Trains
         /// 操作状态
         /// </summary>
         [Description("操作状态")]
-        public EEOperationStatus OperationStatus { get ; set ; }
+        public EEOperationStatus OperationStatus { get; set; }
+
 
-       
 
         // <summary>
         /// 关联课件
@@ -94,7 +119,7 @@ namespace Hotline.Share.Dtos.Trains
         /// 主键
         /// </summary>
         [Description("主键")]
-        public string Id { get ; set ; }
+        public string Id { get; set; }
 
         // <summary>
         /// 关联课件