From e83bf73c16a726b449cdc7d795b1bbb0de2d4b5c Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Mon, 5 Aug 2024 14:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Tiobon.Core.Api/Tiobon.Core.Model.xml         | 17 ++++++----
 Tiobon.Core.Model/Consts.cs                   | 32 +++++++++++--------
 .../Ghre/Ghre_ExamServices.cs                 |  2 +-
 .../Ghre/Ghre_RequiredCourseServices.cs       |  9 ++----
 .../Ghre/Ghre_StudyRecordServices.cs          | 13 ++++++--
 .../Ghre/Ghre_StudyRuleServices.cs            |  2 +-
 Tiobon.Core/Tiobon.Core.Model.xml             | 17 ++++++----
 7 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml
index af668d64..a204a391 100644
--- a/Tiobon.Core.Api/Tiobon.Core.Model.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml
@@ -12727,19 +12727,24 @@
             培训记录-课程状态-已结束
             </summary>
         </member>
-        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN">
+        <member name="T:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus">
             <summary>
-            培训记录-学习状态-未参与
+            培训记录-学习状态
             </summary>
         </member>
-        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_FINISH">
+        <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_JOIN">
             <summary>
-            培训记录-学习状态-未完成
+            未参与
             </summary>
         </member>
-        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_HAS_FINISH">
+        <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_FINISH">
             <summary>
-            培训记录-学习状态-已完成
+            未完成
+            </summary>
+        </member>
+        <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.HAS_FINISH">
+            <summary>
+            已完成
             </summary>
         </member>
         <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS">
diff --git a/Tiobon.Core.Model/Consts.cs b/Tiobon.Core.Model/Consts.cs
index d94e737a..2dc7db16 100644
--- a/Tiobon.Core.Model/Consts.cs
+++ b/Tiobon.Core.Model/Consts.cs
@@ -60,11 +60,11 @@ public class Consts
         /// 人工出题
         /// </summary>
         public const string MANUAL = "manual";
-         
+
         /// <summary>
         /// 随机出题
         /// </summary>
-        public const string RANDOM = "random"; 
+        public const string RANDOM = "random";
 
     }
     #endregion
@@ -157,21 +157,25 @@ public class Consts
     #endregion
 
     #region 培训记录-学习状态
-
-    /// <summary>
-    /// 培训记录-学习状态-未参与
-    /// </summary>
-    public const string DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN = "NoJoin";
-
     /// <summary>
-    /// 培训记录-学习状态-未完成
+    /// 培训记录-学习状态
     /// </summary>
-    public const string DIC_STUDY_RECORD_STUDY_STATUS_FINISH = "NoFinish";
 
-    /// <summary>
-    /// 培训记录-学习状态-已完成
-    /// </summary>
-    public const string DIC_STUDY_RECORD_STUDY_STATUS_HAS_FINISH = "HasFinish";
+    public static class DicStudyRecordStudyStatus
+    {
+        /// <summary>
+        /// 未参与
+        /// </summary>
+        public const string NO_JOIN = "NoJoin";
+        /// <summary>
+        /// 未完成
+        /// </summary>
+        public const string NO_FINISH = "NoFinish";
+        /// <summary>
+        /// 已完成
+        /// </summary>
+        public const string HAS_FINISH = "HasFinish";
+    }
 
     #endregion
 
diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
index 97b7d93a..3399ab19 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
@@ -1280,7 +1280,7 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
                         CourseEndTime = courseTime.Date.AddMonths(snap?.ValidityPeriod ?? 1),
                         CourseType = Consts.DIC_EXAM_STAFF_SOURCE.MANUAL_REQUIRED,
                         CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
-                        StudyStatus = Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN
+                        StudyStatus = Consts.DicStudyRecordStudyStatus.NO_JOIN
                     });
                 }
                 if (inserts.Any())
diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs
index 7c755ea6..95e7f44f 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_RequiredCourseServices.cs
@@ -75,12 +75,9 @@ public class Ghre_RequiredCourseServices : BaseServices<Ghre_RequiredCourse, Ghr
             x.StudyStatusLabel = await GetParaLabel("TrainingStudyStatus", x.StudyStatus);
             //x.IsPassLabel = x.IsPass == true ? "是" : "否";
 
-            if (x.Indate != null)
-                x.Indate1 = x.Indate.Value.ToString("yyyy-MM-dd");
-            if (x.DueDate != null)
-                x.DueDate1 = x.DueDate.Value.ToString("yyyy-MM-dd");
-            if (x.ExamDate != null)
-                x.ExamDate1 = x.ExamDate.Value.ToString("yyyy-MM-dd");
+            x.Indate1 = DateTimeHelper.ConvertToDayString(x.Indate);
+            x.DueDate1 = DateTimeHelper.ConvertToDayString(x.DueDate);
+            x.ExamDate1 = DateTimeHelper.ConvertToDayString(x.ExamDate);
 
         });
 
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
index 178ddccf..9012743d 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs
@@ -12,6 +12,7 @@ using Tiobon.Core.Common.Helper;
 using MySqlX.XDevAPI.Common;
 using SqlSugar;
 using Google.Protobuf.WellKnownTypes;
+using static Tiobon.Core.Model.Consts;
 
 namespace Tiobon.Core.Services
 {
@@ -83,6 +84,7 @@ namespace Tiobon.Core.Services
             {
                 if (!string.IsNullOrWhiteSpace(entity.Indate))
                     entity.Indate = DateTimeHelper.ConvertToDayString(entity.Indate);
+                entity.ExamDate = DateTimeHelper.ConvertToDayString(entity.ExamDate);
             });
 
             return new ServicePageResult<Ghre_StudyRecordDto>(filter.pageNum, total, filter.pageSize, entitys);
@@ -485,7 +487,7 @@ namespace Tiobon.Core.Services
                     CourseEndTime = courseTime.Date.AddMonths(snap?.ValidityPeriod ?? 1),
                     CourseType = "Elective",
                     CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
-                    StudyStatus = Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN
+                    StudyStatus = Consts.DicStudyRecordStudyStatus.NO_JOIN
                 });
             }
             return ServiceResult.OprateSuccess("加入成功！");
@@ -508,6 +510,8 @@ namespace Tiobon.Core.Services
         public async Task<bool> GenerateStaffStudyRecord(ISqlSugarClient Db, long studyRecordId)
         {
             var record = await Db.Queryable<Ghre_StudyRecord>().FirstAsync(x => x.Id == studyRecordId);
+
+
             decimal studyProgress = 0;
             var sql = $@"SELECT ISNULL (A.Hours, 0) * 60 + A.Minutes Minutes
                             FROM Ghre_CourseWare A
@@ -526,8 +530,13 @@ namespace Tiobon.Core.Services
                     studyProgress = 100;
             }
 
-            sql = $"UPDATE Ghre_StudyRecord SET StudyProgress = ISNULL(StudyProgress, 0)+{studyProgress} WHERE Id='{studyRecordId}'";
+            var studyStatus = DicStudyRecordStudyStatus.NO_FINISH;
+            if (studyProgress == 100)
+                studyStatus = DicStudyRecordStudyStatus.HAS_FINISH;
+            sql = $"UPDATE Ghre_StudyRecord SET StudyProgress = ISNULL(StudyProgress, 0)+{studyProgress},StudyStatus='{studyStatus}' WHERE Id='{studyRecordId}'";
             if (studyProgress > 0) await Db.Ado.ExecuteCommandAsync(sql);
+            sql = $"UPDATE Ghre_StudyRecord SET BeginTime=GETDATE(),StudyStatus='{studyStatus}' WHERE BeginTime IS NULL AND Id='{studyRecordId}'";
+            await Db.Ado.ExecuteCommandAsync(sql);
             return true;
         }
         #endregion
diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
index 4d3839f3..ef6e2993 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRuleServices.cs
@@ -270,7 +270,7 @@ public class Ghre_StudyRuleServices : BaseServices<Ghre_StudyRule, Ghre_StudyRul
                                 CourseEndTime = courseTime.Date.AddMonths((rule.DeadlineMonth ?? snap?.ValidityPeriod) ?? 1),
                                 CourseType = rule.RuleType,
                                 CourseStatus = Consts.DIC_STUDY_RECORD_COURSE_STATUS_IN,
-                                StudyStatus = Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN,
+                                StudyStatus = Consts.DicStudyRecordStudyStatus.NO_JOIN,
                                 Year = rule.Year
                             });
                             insertResults.Add(new Ghre_StudyRuleResult()
diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml
index af668d64..a204a391 100644
--- a/Tiobon.Core/Tiobon.Core.Model.xml
+++ b/Tiobon.Core/Tiobon.Core.Model.xml
@@ -12727,19 +12727,24 @@
             培训记录-课程状态-已结束
             </summary>
         </member>
-        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_NO_JOIN">
+        <member name="T:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus">
             <summary>
-            培训记录-学习状态-未参与
+            培训记录-学习状态
             </summary>
         </member>
-        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_FINISH">
+        <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_JOIN">
             <summary>
-            培训记录-学习状态-未完成
+            未参与
             </summary>
         </member>
-        <member name="F:Tiobon.Core.Model.Consts.DIC_STUDY_RECORD_STUDY_STATUS_HAS_FINISH">
+        <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.NO_FINISH">
             <summary>
-            培训记录-学习状态-已完成
+            未完成
+            </summary>
+        </member>
+        <member name="F:Tiobon.Core.Model.Consts.DicStudyRecordStudyStatus.HAS_FINISH">
+            <summary>
+            已完成
             </summary>
         </member>
         <member name="T:Tiobon.Core.Model.Consts.DIC_EXAM_RECORD_STATUS">