From 15c7be45e18501df3731b3697e07494d7e417e36 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Sun, 27 Apr 2025 14:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=BB=B4=E6=8A=A4=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/Tiobon.Web.pdm                          | 106 ++++++++++++------
 .../Ghre/Ghre_ExamServices.cs                 |   8 +-
 2 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm
index 63f892da..63d36dec 100644
--- a/Model/Tiobon.Web.pdm
+++ b/Model/Tiobon.Web.pdm
@@ -12244,13 +12244,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o205">
 <a:CreationDate>1728532977</a:CreationDate>
 <a:ModificationDate>1728532977</a:ModificationDate>
-<a:Rect>((-5924,7725), (-5474,14400))</a:Rect>
+<a:Rect>((-7949,7725), (-3449,14400))</a:Rect>
 <a:ListOfPoints>((-5699,7725),(-5699,14400))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o206"/>
 </c:SourceSymbol>
@@ -12264,13 +12266,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o209">
 <a:CreationDate>1728533087</a:CreationDate>
 <a:ModificationDate>1728533087</a:ModificationDate>
-<a:Rect>((-5924,7312), (3076,7762))</a:Rect>
+<a:Rect>((-5924,7312), (3076,8433))</a:Rect>
 <a:ListOfPoints>((-5924,7537),(3076,7537))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o206"/>
 </c:SourceSymbol>
@@ -12284,13 +12288,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o212">
 <a:CreationDate>1728540045</a:CreationDate>
 <a:ModificationDate>1728540045</a:ModificationDate>
-<a:Rect>((-5511,75), (-5061,6900))</a:Rect>
+<a:Rect>((-7911,75), (-2661,6900))</a:Rect>
 <a:ListOfPoints>((-5286,75),(-5286,6900))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o213"/>
 </c:SourceSymbol>
@@ -12304,13 +12310,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o215">
 <a:CreationDate>1728541044</a:CreationDate>
 <a:ModificationDate>1728541044</a:ModificationDate>
-<a:Rect>((4913,150), (5363,6075))</a:Rect>
+<a:Rect>((2138,150), (8138,6075))</a:Rect>
 <a:ListOfPoints>((5138,150),(5138,6075))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o216"/>
 </c:SourceSymbol>
@@ -12330,7 +12338,9 @@ Shadow=0</a:DisplayPreferences>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o219"/>
 </c:SourceSymbol>
@@ -12344,13 +12354,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o222">
 <a:CreationDate>1729663415</a:CreationDate>
 <a:ModificationDate>1730336612</a:ModificationDate>
-<a:Rect>((-37349,15150), (-31724,15600))</a:Rect>
+<a:Rect>((-37349,15150), (-31724,16271))</a:Rect>
 <a:ListOfPoints>((-37349,15375),(-31724,15375))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o223"/>
 </c:SourceSymbol>
@@ -12364,13 +12376,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o225">
 <a:CreationDate>1730250294</a:CreationDate>
 <a:ModificationDate>1730336612</a:ModificationDate>
-<a:Rect>((-30224,15600), (-29774,21575))</a:Rect>
+<a:Rect>((-32249,15600), (-27749,21575))</a:Rect>
 <a:ListOfPoints>((-29999,21575),(-29999,15600))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o226"/>
 </c:SourceSymbol>
@@ -12384,13 +12398,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o228">
 <a:CreationDate>1730336852</a:CreationDate>
 <a:ModificationDate>1730336852</a:ModificationDate>
-<a:Rect>((-28499,15187), (-20024,15637))</a:Rect>
+<a:Rect>((-28499,15187), (-20024,16308))</a:Rect>
 <a:ListOfPoints>((-20024,15412),(-28499,15412))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o229"/>
 </c:SourceSymbol>
@@ -12404,13 +12420,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o231">
 <a:CreationDate>1730340808</a:CreationDate>
 <a:ModificationDate>1730346524</a:ModificationDate>
-<a:Rect>((-30749,2475), (-30299,14700))</a:Rect>
+<a:Rect>((-32774,2475), (-28274,14700))</a:Rect>
 <a:ListOfPoints>((-30524,2475),(-30524,14700))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o232"/>
 </c:SourceSymbol>
@@ -12425,13 +12443,15 @@ Shadow=0</a:DisplayPreferences>
 <a:CreationDate>1730346502</a:CreationDate>
 <a:ModificationDate>1730373277</a:ModificationDate>
 <a:CenterTextOffset>(300, 1787)</a:CenterTextOffset>
-<a:Rect>((-27299,4725), (-19499,15600))</a:Rect>
+<a:Rect>((-29024,4725), (-19499,15600))</a:Rect>
 <a:ListOfPoints>((-19499,4725),(-27074,4725),(-27074,15600))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o235"/>
 </c:SourceSymbol>
@@ -12445,13 +12465,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o237">
 <a:CreationDate>1731478017</a:CreationDate>
 <a:ModificationDate>1731478017</a:ModificationDate>
-<a:Rect>((-28949,-11662), (-20174,-11212))</a:Rect>
+<a:Rect>((-28949,-11662), (-20174,-10541))</a:Rect>
 <a:ListOfPoints>((-20174,-11437),(-28949,-11437))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o238"/>
 </c:SourceSymbol>
@@ -12465,13 +12487,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o241">
 <a:CreationDate>1731478076</a:CreationDate>
 <a:ModificationDate>1731478076</a:ModificationDate>
-<a:Rect>((-30636,-18225), (-30186,-11025))</a:Rect>
+<a:Rect>((-33411,-18225), (-27411,-11025))</a:Rect>
 <a:ListOfPoints>((-30411,-18225),(-30411,-11025))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o242"/>
 </c:SourceSymbol>
@@ -12485,13 +12509,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o244">
 <a:CreationDate>1731491451</a:CreationDate>
 <a:ModificationDate>1731491451</a:ModificationDate>
-<a:Rect>((-39899,-11325), (-30899,-10875))</a:Rect>
+<a:Rect>((-39899,-11325), (-30899,-10204))</a:Rect>
 <a:ListOfPoints>((-39899,-11100),(-30899,-11100))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o245"/>
 </c:SourceSymbol>
@@ -12506,13 +12532,15 @@ Shadow=0</a:DisplayPreferences>
 <a:CreationDate>1733211832</a:CreationDate>
 <a:ModificationDate>1733211849</a:ModificationDate>
 <a:CenterTextOffset>(75, 1801)</a:CenterTextOffset>
-<a:Rect>((-19349,-11437), (-9674,-10987))</a:Rect>
+<a:Rect>((-19349,-11437), (-9674,-8515))</a:Rect>
 <a:ListOfPoints>((-9674,-11212),(-19349,-11212))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o248"/>
 </c:SourceSymbol>
@@ -12526,13 +12554,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o250">
 <a:CreationDate>1733369860</a:CreationDate>
 <a:ModificationDate>1733369860</a:ModificationDate>
-<a:Rect>((2588,-18975), (3038,-12300))</a:Rect>
+<a:Rect>((563,-18975), (5063,-12300))</a:Rect>
 <a:ListOfPoints>((2813,-18975),(2813,-12300))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o251"/>
 </c:SourceSymbol>
@@ -12546,13 +12576,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o254">
 <a:CreationDate>1733909650</a:CreationDate>
 <a:ModificationDate>1733909650</a:ModificationDate>
-<a:Rect>((16126,-19425), (16576,-13500))</a:Rect>
+<a:Rect>((13726,-19425), (18976,-13500))</a:Rect>
 <a:ListOfPoints>((16351,-19425),(16351,-13500))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o255"/>
 </c:SourceSymbol>
@@ -12566,13 +12598,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o258">
 <a:CreationDate>1734490374</a:CreationDate>
 <a:ModificationDate>1734490374</a:ModificationDate>
-<a:Rect>((-29550,-4274), (-20625,-3824))</a:Rect>
+<a:Rect>((-29550,-4274), (-20625,-3153))</a:Rect>
 <a:ListOfPoints>((-20625,-4049),(-29550,-4049))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o259"/>
 </c:SourceSymbol>
@@ -12586,13 +12620,15 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o262">
 <a:CreationDate>1737086327</a:CreationDate>
 <a:ModificationDate>1737086327</a:ModificationDate>
-<a:Rect>((33751,-10800), (34201,-3975))</a:Rect>
+<a:Rect>((31726,-10800), (36226,-3975))</a:Rect>
 <a:ListOfPoints>((33976,-10800),(33976,-3975))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
 <a:LineColor>16711680</a:LineColor>
 <a:ShadowColor>12632256</a:ShadowColor>
-<a:FontList> 0 Arial,8,N</a:FontList>
+<a:FontList>CENTER 0 新宋体,8,N
+SOURCE 0 新宋体,8,N
+DESTINATION 0 新宋体,8,N</a:FontList>
 <c:SourceSymbol>
 <o:TableSymbol Ref="o263"/>
 </c:SourceSymbol>
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
index 0c309de7..cb0c0191 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@@ -949,7 +949,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 label = "考试成绩规则",
                 field = "ScoreRule",
                 elementType = "ApiSelect",
-                required = false,
+                required = true,
                 multipleSelect = false,
                 editable = true,
                 dataSource = "TBParaDetail_Train_TrainScoreRule"
@@ -959,7 +959,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 label = "学习完成规则",
                 field = "StudyFinishedRule",
                 elementType = "ApiSelect",
-                required = false,
+                required = true,
                 multipleSelect = false,
                 editable = true,
                 dataSource = "TBParaDetail_Train_TrainStudyFinishedRule"
@@ -969,7 +969,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 label = "是否允许查看答案和解析",
                 field = "IsViewResult",
                 elementType = "RadioBox",
-                required = false,
+                required = true,
                 multipleSelect = false,
                 editable = true
             },
@@ -978,7 +978,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                 label = "  查看答案和解析后，是否允许重新考试",
                 field = "IsAfterViewResultRetake",
                 elementType = "RadioBox",
-                required = false,
+                required = true,
                 multipleSelect = false,
                 editable = true
             },