已发布试卷中的试题不可以被删除

草稿箱和已停用可以删除但是发布需要校验
1 year ago · 851556bac8
parent 18d026b3d6
commit 851556bac8
11 changed files with 1334 additions and 1268 deletions
--- a/Model/Tiobon.Web.pdm
+++ b/Model/Tiobon.Web.pdm
--- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs
+++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs
@ -1,7 +1,7 @@
 namespace Tiobon.Core.Api.Controllers;

 /// <summary>
-/// Ghre_ExamRecord(Controller)
+/// 考试记录(Controller)
 /// </summary>
 [Route("api/[controller]")]
 [ApiController, GlobalActionFilter]
--- a/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs
+++ b/Tiobon.Core.IServices/Ghre/IGhre_ExamRecordServices.cs
@ -4,7 +4,7 @@ using Tiobon.Core.Model.Models;
 namespace Tiobon.Core.IServices
 {	
 	/// <summary>
-	/// Ghre_ExamRecord(自定义服务接口)
+	/// 考试记录(自定义服务接口)
 	/// </summary>	
    public interface IGhre_ExamRecordServices :IBaseServices<Ghre_ExamRecord, Ghre_ExamRecordDto, InsertGhre_ExamRecordInput, EditGhre_ExamRecordInput>
 	{
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecord.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecord.Dto.Base.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/5/31 17:43:01  SimonHsiao   初版
+*V0.01  2024/6/21 17:49:13  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@ -22,7 +22,7 @@ namespace Tiobon.Core.Model.Models
 {

    /// <summary>
-    /// Ghre_ExamRecord (Dto.Base)
+    /// 考试记录 (Dto.Base)
    /// </summary>
    public class Ghre_ExamRecordBase
    {
@ -65,14 +65,15 @@ namespace Tiobon.Core.Model.Models
        public DateTime? EndTime { get; set; }

        /// <summary>
-        /// 实际开始时间
+        /// 实际结束时间
        /// </summary>
-        public DateTime? ActualBeginTime { get; set; }
+        public DateTime? ActualEndTime { get; set; }

        /// <summary>
-        /// 实际结束时间
+        /// 状态
        /// </summary>
-        public DateTime? ActualEndTime { get; set; }
+        [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+        public string Status { get; set; }

        /// <summary>
        /// 备注
--- a/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecord.Dto.EditInput.cs
+++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_ExamRecord.Dto.EditInput.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/5/31 17:43:01  SimonHsiao   初版
+*V0.01  2024/6/21 17:49:13  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models
 {

    /// <summary>
-    /// Ghre_ExamRecord (Dto.EditInput)
+    /// 考试记录 (Dto.EditInput)
    /// </summary>
    public class EditGhre_ExamRecordInput : Ghre_ExamRecordBase
    {
--- a/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecord.Dto.InsertInput.cs
+++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_ExamRecord.Dto.InsertInput.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/5/31 17:43:01  SimonHsiao   初版
+*V0.01  2024/6/21 17:49:13  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@ -19,7 +19,7 @@ namespace Tiobon.Core.Model.Models
 {

    /// <summary>
-    /// Ghre_ExamRecord (Dto.InsertInput)
+    /// 考试记录 (Dto.InsertInput)
    /// </summary>
    public class InsertGhre_ExamRecordInput : Ghre_ExamRecordBase
    {
--- a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs
+++ b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/5/31 17:43:01  SimonHsiao   初版
+*V0.01  2024/6/21 17:49:13  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@ -23,9 +23,9 @@ namespace Tiobon.Core.Model.Models
 {

    /// <summary>
-    /// Ghre_ExamRecord (Model)
+    /// 考试记录 (Model)
    /// </summary>
-    [SugarTable("Ghre_ExamRecord", "Ghre_ExamRecord"), Entity(TableCnName = "Ghre_ExamRecord", TableName = "Ghre_ExamRecord")]
+    [SugarTable("Ghre_ExamRecord", "Ghre_ExamRecord"), Entity(TableCnName = "考试记录", TableName = "Ghre_ExamRecord")]
    public class Ghre_ExamRecord : BasePoco
    {

@ -67,14 +67,15 @@ namespace Tiobon.Core.Model.Models
        public DateTime? EndTime { get; set; }

        /// <summary>
-        /// 实际开始时间
+        /// 实际结束时间
        /// </summary>
-        public DateTime? ActualBeginTime { get; set; }
+        public DateTime? ActualEndTime { get; set; }

        /// <summary>
-        /// 实际结束时间
+        /// 状态
        /// </summary>
-        public DateTime? ActualEndTime { get; set; }
+        [Display(Name = "Status"), Description("状态"), MaxLength(32, ErrorMessage = "状态 不能超过 32 个字符")]
+        public string Status { get; set; }

        /// <summary>
        /// 备注
--- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2024/5/31 17:43:01  SimonHsiao   初版
+*V0.01  2024/6/21 17:49:13  SimonHsiao   初版
 *
 * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@ -18,7 +18,7 @@
 namespace Tiobon.Core.Model.Models;

 /// <summary>
-/// Ghre_ExamRecord(Dto.View)
+/// 考试记录(Dto.View)
 /// </summary>
 public class Ghre_ExamRecordDto : Ghre_ExamRecord
 {
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@ -891,6 +891,15 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                    icon = "ghr-publish",
                    position = "left"
                });
+                result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+                {
+                    display = true,
+                    fnKey = "TBD6YN",
+                    fnTitle = "预览",
+                    fnType = "row",
+                    icon = "ghr-preview",
+                    position = "left"
+                });

                break;
            case "F_ExamPaperReleased":
@ -915,6 +924,15 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                    icon = "ghr-icon-stop",
                    position = "left"
                });
+                result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+                {
+                    display = true,
+                    fnKey = "TBD6YN",
+                    fnTitle = "预览",
+                    fnType = "row",
+                    icon = "ghr-preview",
+                    position = "left"
+                });

                break;
            case "F_ExamPaperDisabled":
@ -930,6 +948,15 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                    icon = "ghr-icon-start",
                    position = "left"
                });
+                result.JM_PageControlT1.Toolbar.Add(new Toolbar()
+                {
+                    display = true,
+                    fnKey = "TBD6YN",
+                    fnTitle = "预览",
+                    fnType = "row",
+                    icon = "ghr-preview",
+                    position = "left"
+                });
                break;
            case "F_Training_CoursewWare":
                toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault();
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
@ -8,7 +8,7 @@ using Tiobon.Core.Common.Caches;
 namespace Tiobon.Core.Services
 {
 	/// <summary>
-	/// Ghre_ExamRecord (服务)
+	/// 考试记录 (服务)
 	/// </summary>
    public class Ghre_ExamRecordServices : BaseServices<Ghre_ExamRecord, Ghre_ExamRecordDto, InsertGhre_ExamRecordInput, EditGhre_ExamRecordInput>, IGhre_ExamRecordServices
    {