From 4824eb0655eb6c174d947cc1050b0ccf9736ce38 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 28 Apr 2025 14:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=80=E8=AF=BE=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E5=AD=A6=E4=B9=A0=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E8=87=B3=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Model/Consts.cs                       |  4 ++++
 Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs    |  8 +++++---
 .../Ghre/Ghre_StudyRecordServices.cs              | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Tiobon.Core.Model/Consts.cs b/Tiobon.Core.Model/Consts.cs
index 4bdbd9d6..c4023e10 100644
--- a/Tiobon.Core.Model/Consts.cs
+++ b/Tiobon.Core.Model/Consts.cs
@@ -152,6 +152,10 @@ public class Consts
         /// 必修规则
         /// </summary>
         public const string STUDY_RULE_REQUIRED = "StudyRuleRequired";
+        /// <summary>
+        /// 手动选修
+        /// </summary>
+        public const string MANUAL_ELECTIVE = "ManualElective";
 
     }
     #endregion
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
index baf46165..b32cac47 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@@ -1135,12 +1135,14 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
         data.ForEach(x =>
         {
             if (x.DataSource.IsNull())
-                x.DataSource = Consts.DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED;
+                x.DataSource =  DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED;
 
-            if (x.DataSource == Consts.DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED)
+            if (x.DataSource ==  DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED)
                 x.DataSourceLabel = "手动必修";
-            else if (x.DataSource == Consts.DIC_EXAM_STAFF_SOURCE.STUDY_RULE_REQUIRED)
+            else if (x.DataSource ==  DIC_EXAM_STAFF_SOURCE.STUDY_RULE_REQUIRED)
                 x.DataSourceLabel = "必修规则";
+            else if (x.DataSource ==  DIC_EXAM_STAFF_SOURCE.MANUAL_ELECTIVE)
+                x.DataSourceLabel = "手动选修";
         });
 
         return ServiceResult<List<StaffTableData>>.OprateSuccess("查询成功！", data);
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 21d0b76c..f38439fe 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -4,6 +4,8 @@ using NPOI.HSSF.UserModel;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
+using System.Drawing.Drawing2D;
+using Tiobon.Core.IServices;
 using static Tiobon.Core.DataAccess.ReportHelper;
 using static Tiobon.Core.Model.Consts;
 
@@ -285,7 +287,7 @@ public class Ghre_StudyRecordServices : BaseServices<Ghre_StudyRecord, Ghre_Stud
             .AnyAsync(x => x.StaffId == entity.StaffId))
             throw new Exception("该用户存在相同学习记录！");
 
-        
+
         entity.StudyStatus = "HasFinish";
 
         var snap = await Db.Queryable<Ghre_CourseSnap>().FirstAsync(x => x.CourseId == entity.CourseId);
@@ -1681,6 +1683,17 @@ WHERE A.Id  = '{id}'";
                 StudyStatus = DIC_STUDY_RECORD_STUDY_STATUS.NO_JOIN,
                 ExamId = exam?.Id
             });
+
+            if (exam != null)
+            {
+                var insertStaff = new Ghre_ExamStaff()
+                {
+                    ExamId = exam?.Id,
+                    StaffId = staffId,
+                    Source = DIC_EXAM_STAFF_SOURCE.MANUAL_ELECTIVE
+                };
+                await Db.Insertable(insertStaff).ExecuteReturnSnowflakeIdAsync();
+            }
         }
         return ServiceResult.OprateSuccess("加入成功！");
     }