guqiang 1 сар өмнө
parent
commit
db91dbd307

+ 0 - 1
src/Hotline.Api/Controllers/Exam/QuestionController.cs

@@ -103,7 +103,6 @@ namespace Hotline.Api.Controllers.Exam
         /// </summary>
         /// <returns></returns>
         [HttpPost(ExamManageApiRoute.ImportExcel)]
-        [AllowAnonymous]
         public async Task ImportExcel(IFormFile files)
         {
             await _questionService.ImportExcel(files, HttpContext.RequestAborted);

+ 9 - 2
src/Hotline.Application/Exam/Service/Questions/QuestionService.cs

@@ -270,13 +270,20 @@ namespace Hotline.Application.Exam.Service.Questions
 
             contents.ForEach(item =>
             {
-                var tagNameStr = ((ExpandoObject)item).GetValueOrDefault(SystemConstants.Labels[3])?.ToString();
+                var tagNameStr = ((ExpandoObject)item).GetValueOrDefault(SystemConstants.ColumnNames[1])?.ToString();
 
                 if (tagNameStr.IsNotNullOrEmpty())
                 {
                     var names = tagNameStr.Split(",").ToList();
 
-                    tagNames.AddRange(names);
+                    names.ForEach(name =>
+                    {
+                        if (!tagNames.Contains(name))
+                        {
+                            tagNames.Add(name);
+                        }
+                    });
+                    
                 }
             });
 

+ 2 - 1
src/Hotline.Repository.SqlSugar/Exam/Repositories/ExamRepository.cs

@@ -147,7 +147,8 @@ namespace Exam.Repository.Sqlsugar.Repositories
             if (!validatorResult.IsValid)
             {
                 var errorMessages = validatorResult.ErrorItems.Select(x => x.ErrorMessage);
-                throw new UserFriendlyException(ErrorMessage.RequestFail,string.Join(";", errorMessages));
+                //throw new UserFriendlyException(ErrorMessage.RequestFail,string.Join(";", errorMessages));
+                throw UserFriendlyException.SameMessage(string.Join(";", errorMessages));
             }
         }
 

+ 6 - 6
src/Hotline.Share/Enums/Exams/EExamMode.cs

@@ -5,15 +5,15 @@ namespace Hotline.Share.Enums.Exams
     public enum EExamMode
     {
         /// <summary>
-        /// 人工组
+        /// 随机试
         /// </summary>
-        [Description("人工组题")]
-        Manual = 0,
+        [Description("随机试题")]
+        Random = 0,
         /// <summary>
-        /// 随机组
+        /// 自选试
         /// </summary>
-        [Description("随机组题")]
-        Random = 1,
+        [Description("自选试题")]
+        Manual = 1,
         /// <summary>
         /// 导入
         /// </summary>