培训记录新增关联培训计划

3 months ago · 384cf65486
parent a5faccb690
commit 384cf65486
10 changed files with 2812 additions and 2740 deletions
--- a/Model/Tiobon.Web.pdm
+++ b/Model/Tiobon.Web.pdm
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@ -7085,6 +7085,16 @@
            有效结束时间
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.IsIssueCertificate">
+            <summary>
+            是否发放证书
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.PlanId">
+            <summary>
+            培训计划ID
+            </summary>
+        </member>
        <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailBase">
            <summary>
            培训记录明细 (Dto.Base)
@ -22921,6 +22931,11 @@
            是否发放证书
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.PlanId">
+            <summary>
+            培训计划ID
+            </summary>
+        </member>
        <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetail">
            <summary>
            培训记录明细 (Model)
@ -32582,6 +32597,11 @@
            结果有效期
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordDto.PlanName">
+            <summary>
+            培训计划
+            </summary>
+        </member>
        <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailDto">
            <summary>
            培训记录明细(Dto.View1)
--- a/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
+++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StudyRecord.Dto.Base.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/2/24 14:54:30  SimonHsiao   初版
+*V0.01  2025/3/26 16:46:15  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@ -219,4 +219,14 @@ public class Ghre_StudyRecordBase
    /// 有效结束时间
    /// </summary>
    public DateTime? ValidEndTime { get; set; }
+
+    /// <summary>
+    /// 是否发放证书
+    /// </summary>
+    public bool? IsIssueCertificate { get; set; }
+
+    /// <summary>
+    /// 培训计划ID
+    /// </summary>
+    public long? PlanId { get; set; }
 }
--- a/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
+++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StudyRecord.cs
@ -6,7 +6,7 @@
 *
 * Ver    变更日期 负责人  变更内容
 * ───────────────────────────────────
-*V0.01  2025/3/7 15:08:16  SimonHsiao   初版
+*V0.01  2025/3/26 16:46:15  SimonHsiao   初版
 *
 * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved.
 *┌──────────────────────────────────┐
@ -225,4 +225,9 @@ public class Ghre_StudyRecord : BasePoco
    /// 是否发放证书
    /// </summary>
    public bool? IsIssueCertificate { get; set; }
+
+    /// <summary>
+    /// 培训计划ID
+    /// </summary>
+    public long? PlanId { get; set; }
 }
--- a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs
+++ b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs
@ -162,4 +162,9 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord
    public string ResultValidPeriod { get; set; }
    public int? AnswerCount { get; set; } = 0;

+    /// <summary>
+    /// 培训计划
+    /// </summary>
+    public string PlanName { get; set; }
+
 }
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@ -1425,7 +1425,8 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                    CourseEndTime = courseEndTime,
                    CourseType = DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED,
                    CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
-                    StudyStatus = DIC_STUDY_RECORD_STUDY_STATUS.NO_JOIN
+                    StudyStatus = DIC_STUDY_RECORD_STUDY_STATUS.NO_JOIN,
+                    PlanId = entity.PlanId,
                });
        }
        if (inserts.Any())
--- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs
@ -1,6 +1,4 @@
-using NPOI.XWPF.UserModel;
-
-namespace Tiobon.Core.Services;
+namespace Tiobon.Core.Services;

 /// <summary>
 /// 开班管理 (服务)
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@ -1366,7 +1366,8 @@ WHERE A.Status !='Temporary' AND   (   EXISTS
                //CourseType = rule.RuleType,
                CourseStatus = DIC_STUDY_RECORD_COURSE_STATUS_IN,
                StudyStatus = DIC_STUDY_RECORD_STUDY_STATUS.NO_JOIN,
-                OpenClassId = openClass.Id
+                OpenClassId = openClass.Id,
+                PlanId = openClass.PlanId
            };
            id = await base.Add(studyRecord);
        }
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
@ -432,7 +432,8 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
                                CourseType = rule.RuleType,
                                CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
                                StudyStatus = Consts.DIC_STUDY_RECORD_STUDY_STATUS.NO_JOIN,
-                                Year = rule.Year
+                                Year = rule.Year,
+                                PlanId = rule.PlanId
                            });
                            insertResults.Add(new Ghre_StudyRuleResult()
                            {
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@ -7085,6 +7085,16 @@
            有效结束时间
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.IsIssueCertificate">
+            <summary>
+            是否发放证书
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordBase.PlanId">
+            <summary>
+            培训计划ID
+            </summary>
+        </member>
        <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailBase">
            <summary>
            培训记录明细 (Dto.Base)
@ -22921,6 +22931,11 @@
            是否发放证书
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecord.PlanId">
+            <summary>
+            培训计划ID
+            </summary>
+        </member>
        <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetail">
            <summary>
            培训记录明细 (Model)
@ -32582,6 +32597,11 @@
            结果有效期
            </summary>
        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_StudyRecordDto.PlanName">
+            <summary>
+            培训计划
+            </summary>
+        </member>
        <member name="T:Tiobon.Core.Model.Models.Ghre_StudyRecordDetailDto">
            <summary>
            培训记录明细(Dto.View1)