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 /// 必修规则 /// public const string STUDY_RULE_REQUIRED = "StudyRuleRequired"; + /// + /// 手动选修 + /// + 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 { 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>.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 x.StaffId == entity.StaffId)) throw new Exception("该用户存在相同学习记录!"); - + entity.StudyStatus = "HasFinish"; var snap = await Db.Queryable().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("加入成功!"); }