页面修改

Edu.Common/Plugin/StringHelper.cs

@@ -1614,6 +1614,5 @@ namespace Edu.Common.Plugin
             }
             return new string(array);
         }
-
     }
 }

Edu.Model/Entity/Exam/RB_Examination_Template.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Exam
+{
+	/// <summary>
+	/// 试卷自动组卷模板表实体类
+	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
+	public class RB_Examination_Template
+    {
+		/// <summary>
+		/// 试卷模板编号
+		/// </summary>
+		public int TemplateId { get; set; }
+
+		/// <summary>
+		/// 试卷标题
+		/// </summary>
+		public string TemplateName { get; set; }
+
+		/// <summary>
+		/// 试卷满分
+		/// </summary>
+		public decimal TemplateScore { get; set; }
+
+		/// <summary>
+		/// 随机组卷数量
+		/// </summary>
+		public int TemplateNum { get; set; }
+
+		/// <summary>
+		/// 试卷难易程度
+		/// </summary>
+		public int TemplateDifficultyType { get; set; }
+
+		/// <summary>
+		/// 模板数据
+		/// </summary>
+		public string TemplateData { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 模板题库编号
+		/// </summary>
+		public string TemplateBankIds { get; set; }
+	}
+}
\ No newline at end of file

Edu.Model/ViewModel/Exam/ExamTemplate.cs

+using Edu.Common.Enum.Question;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Exam
+{
+    /// <summary>
+    /// 试卷模板数据格式
+    /// </summary>
+    public class ExamTemplate
+    {
+        /// <summary>
+        /// 问题类型编号
+        /// </summary>
+        public int QuestionTypeId { get; set; }
+
+        /// <summary>
+        /// 问题类型Key
+        /// </summary>
+        public string QuestionTypeKey { get; set; }
+
+        /// <summary>
+        /// 问题类型名称
+        /// </summary>
+        public string QuestionTypeName { get; set; }
+
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public decimal QuestionScore { get; set; }
+
+        /// <summary>
+        /// 题型描述
+        /// </summary>
+        public string QuestionDesc { get; set; }
+
+        /// <summary>
+        /// 选择类型(1-题库随机，2-题库难易程度)
+        /// </summary>
+        public int ChooseType { get; set; }
+
+        /// <summary>
+        /// 选择题目数量【ChooseType=1时使用】
+        /// </summary>
+        public int ChooseNum { get; set; }
+
+        /// <summary>
+        /// 难易程度选题【ChooseType=2时使用】
+        /// </summary>
+        public List<DifficultyTypeItem> ChooseList { get; set; }
+    }
+
+    /// <summary>
+    /// 难易程度
+    /// </summary>
+    public class DifficultyTypeItem
+    {
+        /// <summary>
+        /// 难易程度(1-易，2-中，3-难)
+        /// </summary>
+        public DifficultyTypeEnum DifficultyType { get; set; }
+
+        /// <summary>
+        /// 选择题目数量【ChooseType=2时使用】
+        /// </summary>
+        public int ChooseNum { get; set; }
+    }
+}

Edu.Model/ViewModel/Exam/RB_Examination_Template_ViewModel.cs

+using Edu.Model.Entity.Exam;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Exam
+{
+    /// <summary>
+    /// 试卷自动组卷模板表视图实体类
+    /// </summary>
+    public class RB_Examination_Template_ViewModel : RB_Examination_Template
+    {
+    }
+}

Edu.Module.Course/CourseModule.cs

@@ -1726,12 +1726,14 @@ namespace Edu.Module.Course
             demodel.SpecificationList = new List<RB_Goods_Specification_Extend>();
             demodel.SpecificationPriceList = new List<RB_Goods_SpecificationPrice_Extend>();
 
-            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_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.CourseId, 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())
@@ -1739,13 +1741,15 @@ 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()

Edu.Module.Exam/PaperModule.cs

@@ -37,6 +37,11 @@ namespace Edu.Module.Exam
         /// </summary>
         private readonly AnalysisQuestionTypeModule analysisQuestion = new AnalysisQuestionTypeModule();
 
+        /// <summary>
+        /// 试卷模板仓储层对象
+        /// </summary>
+        private readonly RB_Examination_TemplateRepository examination_TemplateRepository = new RB_Examination_TemplateRepository();
+
         /// <summary>
         /// 获取试卷分页列表
         /// </summary>
@@ -308,7 +313,7 @@ namespace Edu.Module.Exam
                                 {
                                     newTitle = sItem.Title;
                                 }
-                                sItem.ShowTitle = newTitle;
+                                sItem.ShowTitle = Common.Plugin.StringHelper.FilterHtml(newTitle);
                             }
                         }
                     }

Edu.Repository/Exam/RB_Examination_TemplateRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Exam;
+using Edu.Model.ViewModel.Exam;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Exam
+{
+    /// <summary>
+    /// 试卷自动组卷模板表仓储层
+    /// </summary>
+    public class RB_Examination_TemplateRepository : BaseRepository<RB_Examination_Template>
+    {
+        /// <summary>
+        /// 获取试卷模板分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Examination_Template_ViewModel> GetExaminationTemplatePageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Examination_Template_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Examination_Template AS A
+WHERE 1=1
+
+");
+            builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Template_ViewModel.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Template_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Template_ViewModel.CreateBy), query.CreateBy);
+                }
+            }
+            return GetPage<RB_Examination_Template_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+    }
+}
\ No newline at end of file