From 74203eeae28f3c5b5cac883d3a704a11a83a1d40 Mon Sep 17 00:00:00 2001
From: Tiobon <Tiobon@LAPTOP-SEA23CI0>
Date: Mon, 14 Apr 2025 17:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=96=B0=E5=A2=9E=E6=9C=80?=
 =?UTF-8?q?=E7=BB=88=E5=BE=97=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml         | 10 ++++
 Tiobon.Core.Api/Tiobon.Core.xml               |  2 +-
 .../Base/Ghre/Ghre_ExamRecord.Dto.Base.cs     |  8 ++-
 .../Models/Ghre/Ghre_ExamRecord.cs            |  8 ++-
 .../Ghre/Ghre_ExamPaperServices.cs            |  2 +-
 .../Ghre/Ghre_ExamRecordServices.cs           |  1 -
 .../Ghre/Ghre_QuestionServices.cs             | 56 ++++++++++++++++++-
 Tiobon.Core/Tiobon.Core.Model.xml             | 10 ++++
 Tiobon.Core/Tiobon.Core.xml                   |  7 +++
 9 files changed, 97 insertions(+), 7 deletions(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index 0a3a0550..e3fb8928 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -4740,6 +4740,11 @@
             答题次数
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.FinallyScore">
+            <summary>
+            最终得分
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase">
             <summary>
             Ghre_ExamRecordAnswer (Dto.Base)
@@ -21937,6 +21942,11 @@
             答题次数
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.FinallyScore">
+            <summary>
+            最终得分
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer">
             <summary>
             Ghre_ExamRecordAnswer (Model)
diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml
index 5b607143..7f04d5e6 100644
--- a/Tiobon.Core.Api/Tiobon.Core.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.xml
@@ -1455,7 +1455,7 @@
         </member>
         <member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryRecord(System.Int64)">
             <summary>
-            开始
+            记录
             </summary> 
             <param name="id"></param>
             <returns></returns>
diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecord.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_ExamRecord.Dto.Base.cs
index 18221114..954e558d 100644
--- 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  2025/3/10 23:34:26  SimonHsiao   初版
+*V0.01  2025-04-14 16:33:46  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -255,4 +255,10 @@ public class Ghre_ExamRecordBase
     /// 答题次数
     /// </summary>
     public int? AnswerCount { get; set; }
+
+    /// <summary>
+    /// 最终得分
+    /// </summary>
+    [Display(Name = "FinallyScore"), Description("最终得分"), Column(TypeName = "decimal(20,2)")]
+    public decimal? FinallyScore { get; set; }
 }
diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs
index ec54d81d..b766b16e 100644
--- 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  2025/3/10 23:34:26  SimonHsiao   初版
+*V0.01  2025-04-14 16:33:46  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@@ -256,4 +256,10 @@ public class Ghre_ExamRecord : BasePoco
     /// 答题次数
     /// </summary>
     public int? AnswerCount { get; set; }
+
+    /// <summary>
+    /// 最终得分
+    /// </summary>
+    [Display(Name = "FinallyScore"), Description("最终得分"), Column(TypeName = "decimal(20,2)")]
+    public decimal? FinallyScore { get; set; }
 }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
index 80c247f5..49256d89 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
@@ -345,7 +345,7 @@ public class Ghre_ExamPaperServices : BaseServices<Ghre_ExamPaper, Ghre_ExamPape
                 label = "系统内置",
                 field = "BuiltIn",
                 elementType = "Switch",
-                required = true,
+                required = false,
                 multipleSelect = false,
                 editable = true,
             }
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
index 6053da95..0ccd033c 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs
@@ -1,7 +1,6 @@
 using AgileObjects.AgileMapper.Extensions;
 using Microsoft.Extensions.Logging;
 using MongoDB.Driver.Linq;
-using NPOI.SS.Formula.Functions;
 using System.Net;
 using System.Text.RegularExpressions;
 using static Tiobon.Core.Model.Consts;
diff --git a/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
index 2fea6a6c..c379ef55 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
@@ -85,8 +85,41 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
                         }
                     }
                 }
-                else
-                if (!string.IsNullOrWhiteSpace(value))
+                else if (name == "CourseId")
+                {
+                    string sql = string.Empty;
+                    if (!string.IsNullOrWhiteSpace(value))
+                    {
+                        var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
+
+                        if (jsonParam.columnValue.IsNotEmptyOrNull())
+                            switch (jsonParam.operationKey)
+                            {
+                                //case "Include":
+                                //    query = query.Where(x => x.CourseId != null && ids.Contains(x.CourseId.Value));
+                                //    break;
+                                //case "NotInclude":
+                                //    query = query.Where(x => x.CourseId != null && !ids1.Contains(x.CourseId.Value));
+                                //    break;
+                                //case "IsNull":
+                                //    query = query.Where(x => x.CourseId == null);
+                                //    break;
+                                //case "NotNull":
+                                //    query = query.Where(x => x.CourseId != null);
+                                //    break;
+                                case "Equal":
+                                    query = query.Where(x => x.CourseId == jsonParam.columnValue.ObjToLong() || x.CourseIds.Contains(jsonParam.columnValue.ObjToString()));
+
+                                    break;
+                                //case "NotEqual":
+                                //    query = query.Where(x => x.CourseId != id1);
+                                //    break;
+                                default:
+                                    break;
+                            }
+                    }
+                }
+                else if (!string.IsNullOrWhiteSpace(value))
                 {
                     var jsonParam = JsonConvert.DeserializeObject<JsonParam>(value);
 
@@ -226,6 +259,25 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
                     }
                     continue;
                 }
+                else if (name == "CourseId")
+                {
+                    var jsonParam = JsonHelper.JsonToObj<JsonParam>(value);
+
+                    if (jsonParam.columnValue != null)
+                    {
+
+                        switch (jsonParam.operationKey)
+                        {
+                            case "Equal":
+                                if (jsonParam.columnValue != null)
+                                    conditions += @$" AND (CourseIds like '%{jsonParam.columnValue}%' or CourseId='{jsonParam.columnValue}')";
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    continue;
+                }
 
                 if (!string.IsNullOrWhiteSpace(value))
                     conditions = DealConditions(conditions, name, value);
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index 0a3a0550..e3fb8928 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -4740,6 +4740,11 @@
             答题次数
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecordBase.FinallyScore">
+            <summary>
+            最终得分
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswerBase">
             <summary>
             Ghre_ExamRecordAnswer (Dto.Base)
@@ -21937,6 +21942,11 @@
             答题次数
             </summary>
         </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamRecord.FinallyScore">
+            <summary>
+            最终得分
+            </summary>
+        </member>
         <member name="T:Tiobon.Core.Model.Models.Ghre_ExamRecordAnswer">
             <summary>
             Ghre_ExamRecordAnswer (Model)
diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml
index ccc09d81..7f04d5e6 100644
--- a/Tiobon.Core/Tiobon.Core.xml
+++ b/Tiobon.Core/Tiobon.Core.xml
@@ -1453,6 +1453,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_SurveyController.QueryRecord(System.Int64)">
+            <summary>
+            记录
+            </summary> 
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="T:Tiobon.Core.Api.Controllers.Ghre_SurveyOptionController">
             <summary>
             问卷调查选项(Controller)