diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index cd1c9d66..6e35a8d2 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -4555,6 +4555,11 @@ 有效结束时间 + + + 答题次数 + + Ghre_ExamRecordAnswer (Dto.Base) @@ -20161,6 +20166,11 @@ 有效结束时间 + + + 答题次数 + + Ghre_ExamRecordAnswer (Model) 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 7ec3917d..18221114 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/7 15:49:54 SimonHsiao 初版 +*V0.01 2025/3/10 23:34:26 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -250,4 +250,9 @@ public class Ghre_ExamRecordBase /// 有效结束时间 /// public DateTime? ValidEndTime { get; set; } + + /// + /// 答题次数 + /// + public int? AnswerCount { get; set; } } diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_ExamRecord.cs index 75c82556..ec54d81d 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/7 15:49:54 SimonHsiao 初版 +*V0.01 2025/3/10 23:34:26 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -251,4 +251,9 @@ public class Ghre_ExamRecord : BasePoco /// 有效结束时间 /// public DateTime? ValidEndTime { get; set; } + + /// + /// 答题次数 + /// + public int? AnswerCount { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs index 9f62fe61..5171fe48 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs @@ -160,5 +160,6 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord /// 结果有效期 /// public string ResultValidPeriod { get; set; } + public int? AnswerCount { get; set; } = 0; } diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs index d6bccdfd..f4264fdb 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs @@ -1067,6 +1067,9 @@ public class Ghre_ExamRecordServices : BaseServices().FirstAsync(x => x.Id == record.StudyRecordId); var examPaper = await Db.Queryable().FirstAsync(x => x.Id == record.ExamPaperId); - record.IsPass = examPaper.PassScore > (record.Score + record.AdjustScore) ? false : true; + record.IsPass = examPaper.PassScore > ((record.Score ?? 0) + (record.AdjustScore ?? 0)) ? false : true; record.FinallyIsPass = record.IsPass; diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index cd1c9d66..6e35a8d2 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -4555,6 +4555,11 @@ 有效结束时间 + + + 答题次数 + + Ghre_ExamRecordAnswer (Dto.Base) @@ -20161,6 +20166,11 @@ 有效结束时间 + + + 答题次数 + + Ghre_ExamRecordAnswer (Model)