From b8ea65888eb924b0205d99e16772ceec92bffae4 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 7 Jan 2025 15:43:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BF=85=E9=80=89=E4=BF=AE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9C=AA=E5=AD=A6=E4=B9=A0=E5=AD=A6=E4=B9=A0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/Tiobon.Web.pdm                          | 40 +++++++++----------
 .../Ghre/Ghre_CourseServices.cs               |  2 +-
 .../Ghre/Ghre_StudyRuleServices.cs            | 10 +++++
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm
index b5ce80dd..bd1a2f50 100644
--- a/Model/Tiobon.Web.pdm
+++ b/Model/Tiobon.Web.pdm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1736148865" Name="Tiobon" Objects="2781" Symbols="104" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
+<?PowerDesigner AppLocale="UTF16" ID="{C294868A-C3F3-41AD-98CC-78B6D4E0CC40}" Label="" LastModificationDate="1736228344" Name="Tiobon" Objects="2781" Symbols="104" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="15.0.0.2613"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -11732,7 +11732,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o128">
 <a:CreationDate>1728532977</a:CreationDate>
 <a:ModificationDate>1728532977</a:ModificationDate>
-<a:Rect>((-7949,7725), (-3449,14400))</a:Rect>
+<a:Rect>((-7911,7725), (-3487,14400))</a:Rect>
 <a:ListOfPoints>((-5699,7725),(-5699,14400))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11752,7 +11752,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o132">
 <a:CreationDate>1728533087</a:CreationDate>
 <a:ModificationDate>1728533087</a:ModificationDate>
-<a:Rect>((-5924,7312), (3076,8833))</a:Rect>
+<a:Rect>((-5924,7312), (3076,8883))</a:Rect>
 <a:ListOfPoints>((-5924,7537),(3076,7537))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11772,7 +11772,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o135">
 <a:CreationDate>1728540045</a:CreationDate>
 <a:ModificationDate>1728540045</a:ModificationDate>
-<a:Rect>((-7911,75), (-2661,6900))</a:Rect>
+<a:Rect>((-7873,75), (-2699,6900))</a:Rect>
 <a:ListOfPoints>((-5286,75),(-5286,6900))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11792,7 +11792,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o138">
 <a:CreationDate>1728541044</a:CreationDate>
 <a:ModificationDate>1728541044</a:ModificationDate>
-<a:Rect>((2138,150), (8138,6075))</a:Rect>
+<a:Rect>((2176,150), (8100,6075))</a:Rect>
 <a:ListOfPoints>((5138,150),(5138,6075))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11832,7 +11832,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o145">
 <a:CreationDate>1729663415</a:CreationDate>
 <a:ModificationDate>1730336612</a:ModificationDate>
-<a:Rect>((-37349,15150), (-31724,16671))</a:Rect>
+<a:Rect>((-37349,15150), (-31724,16721))</a:Rect>
 <a:ListOfPoints>((-37349,15375),(-31724,15375))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11852,7 +11852,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o148">
 <a:CreationDate>1730250294</a:CreationDate>
 <a:ModificationDate>1730336612</a:ModificationDate>
-<a:Rect>((-32249,15600), (-27749,21575))</a:Rect>
+<a:Rect>((-32211,15600), (-27787,21575))</a:Rect>
 <a:ListOfPoints>((-29999,21575),(-29999,15600))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11872,7 +11872,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o151">
 <a:CreationDate>1730336852</a:CreationDate>
 <a:ModificationDate>1730336852</a:ModificationDate>
-<a:Rect>((-28499,15187), (-20024,16708))</a:Rect>
+<a:Rect>((-28499,15187), (-20024,16758))</a:Rect>
 <a:ListOfPoints>((-20024,15412),(-28499,15412))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11892,7 +11892,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o154">
 <a:CreationDate>1730340808</a:CreationDate>
 <a:ModificationDate>1730346524</a:ModificationDate>
-<a:Rect>((-32774,2475), (-28274,14700))</a:Rect>
+<a:Rect>((-32736,2475), (-28312,14700))</a:Rect>
 <a:ListOfPoints>((-30524,2475),(-30524,14700))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11913,7 +11913,7 @@ Shadow=0</a:DisplayPreferences>
 <a:CreationDate>1730346502</a:CreationDate>
 <a:ModificationDate>1730373277</a:ModificationDate>
 <a:CenterTextOffset>(300, 1787)</a:CenterTextOffset>
-<a:Rect>((-29024,4725), (-19499,15600))</a:Rect>
+<a:Rect>((-28986,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>
@@ -11933,7 +11933,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o160">
 <a:CreationDate>1731478017</a:CreationDate>
 <a:ModificationDate>1731478017</a:ModificationDate>
-<a:Rect>((-28949,-11662), (-20174,-10140))</a:Rect>
+<a:Rect>((-28949,-11662), (-20174,-10091))</a:Rect>
 <a:ListOfPoints>((-20174,-11437),(-28949,-11437))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11953,7 +11953,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o164">
 <a:CreationDate>1731478076</a:CreationDate>
 <a:ModificationDate>1731478076</a:ModificationDate>
-<a:Rect>((-33411,-18225), (-27411,-11025))</a:Rect>
+<a:Rect>((-33373,-18225), (-27449,-11025))</a:Rect>
 <a:ListOfPoints>((-30411,-18225),(-30411,-11025))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11973,7 +11973,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o167">
 <a:CreationDate>1731491451</a:CreationDate>
 <a:ModificationDate>1731491451</a:ModificationDate>
-<a:Rect>((-39899,-11325), (-30899,-9803))</a:Rect>
+<a:Rect>((-39899,-11325), (-30899,-9754))</a:Rect>
 <a:ListOfPoints>((-39899,-11100),(-30899,-11100))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -11994,7 +11994,7 @@ 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,-8114))</a:Rect>
+<a:Rect>((-19349,-11437), (-9674,-8065))</a:Rect>
 <a:ListOfPoints>((-9674,-11212),(-19349,-11212))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -12014,7 +12014,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o173">
 <a:CreationDate>1733369860</a:CreationDate>
 <a:ModificationDate>1733369860</a:ModificationDate>
-<a:Rect>((563,-18975), (5063,-12300))</a:Rect>
+<a:Rect>((601,-18975), (5025,-12300))</a:Rect>
 <a:ListOfPoints>((2813,-18975),(2813,-12300))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -12034,7 +12034,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o177">
 <a:CreationDate>1733909650</a:CreationDate>
 <a:ModificationDate>1733909650</a:ModificationDate>
-<a:Rect>((13726,-19425), (18976,-13500))</a:Rect>
+<a:Rect>((13764,-19425), (18938,-13500))</a:Rect>
 <a:ListOfPoints>((16351,-19425),(16351,-13500))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -12054,7 +12054,7 @@ Shadow=0</a:DisplayPreferences>
 <o:ReferenceSymbol Id="o181">
 <a:CreationDate>1734490374</a:CreationDate>
 <a:ModificationDate>1734490374</a:ModificationDate>
-<a:Rect>((-29550,-4274), (-20625,-2752))</a:Rect>
+<a:Rect>((-29550,-4274), (-20625,-2703))</a:Rect>
 <a:ListOfPoints>((-20625,-4049),(-29550,-4049))</a:ListOfPoints>
 <a:CornerStyle>2</a:CornerStyle>
 <a:ArrowStyle>1</a:ArrowStyle>
@@ -24894,11 +24894,11 @@ LABL 0 Arial Unicode MS,8,N</a:FontList>
 <a:Code>CourseName</a:Code>
 <a:CreationDate>1721021023</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
-<a:ModificationDate>1721021023</a:ModificationDate>
+<a:ModificationDate>1736228344</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
 <a:Comment>课程名称</a:Comment>
-<a:DataType>nvarchar(32)</a:DataType>
-<a:Length>32</a:Length>
+<a:DataType>nvarchar(64)</a:DataType>
+<a:Length>64</a:Length>
 </o:Column>
 <o:Column Id="o1158">
 <a:ObjectID>F934B12A-9474-48D7-B839-CBB51FF4CC11</a:ObjectID>
diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
index 2f4c56f3..fc7b2a38 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
@@ -49,7 +49,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
                               WHERE A.IsEnable = 1) A";
 
         if (string.IsNullOrWhiteSpace(filter.orderBy))
-            filter.orderBy = "CourseNo DESC";
+            filter.orderBy = "CourseNo ASC";
 
         string conditions = " WHERE 1=1";
 
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
index 47b08816..bafb4fed 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
@@ -635,6 +635,16 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
         if (await Db.Queryable<Ghre_StudyRecord>().AnyAsync(x => x.StudyRuleId == id.ObjToLong() && x.StudyStatus != Consts.DIC_STUDY_RECORD_STUDY_STATUS.NO_JOIN))
             throw new Exception($"有学员已经学习，暂不可作废！");
 
+        await Db.Updateable<Ghre_StudyRecord>()
+          .SetColumns(it => new Ghre_StudyRecord()
+          {
+              IsEnable = 0,
+              UpdateTime = DateTime.Now,
+              UpdateBy = App.User.ID
+          })
+          .Where(it => it.StudyRuleId == id.ObjToLong())
+          .ExecuteCommandAsync();
+
         return await base.DeleteById1(id);
     }