From 02e5af37c79351deea103119e4033d19e5bcb558 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 30 May 2025 13:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=8F=AD=E8=BD=AC=E5=85=A5=E5=BC=80?= =?UTF-8?q?=E8=AF=BE=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=BA=A7=E7=94=9F=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=9B=86=E5=9B=A2=E6=95=B0=E6=8D=AE=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=20=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95=E3=80=81=E8=80=83?= =?UTF-8?q?=E8=AF=95=E8=AE=B0=E5=BD=95=E3=80=81=E8=AF=BE=E7=A8=8B/?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=9C=BA=E6=99=AF=E5=88=86=E6=9E=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B0=E5=A2=9E=E9=9B=86=E5=9B=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E8=BF=87=E6=BB=A4=20=E5=BF=85=E9=80=89?= =?UTF-8?q?=E4=BF=AE=E6=9F=A5=E8=AF=A2=E8=A1=A8=E3=80=81=E8=AE=B2=E5=B8=88?= =?UTF-8?q?=E4=B8=8A=E8=AF=BE=E5=88=86=E6=9E=90=E3=80=81=E5=AD=A6=E5=88=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E4=BA=BA=E8=AF=81=E5=AF=B9=E7=85=A7?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 32 +++++++++---------- .../Controllers/Ghre/Ghre_CourseController.cs | 3 +- .../View/Ghre/Ghre_ExamRecord.Dto.View.cs | 3 ++ .../View/Ghre/Ghre_StudyRecord.Dto.View.cs | 2 ++ .../Ghre/Ghre_CertificateServices.cs | 3 +- .../Ghre/Ghre_CourseServices.cs | 2 +- .../Ghre/Ghre_CreditPointServices.cs | 3 +- .../Ghre/Ghre_ExamRecordServices.cs | 4 ++- .../Ghre/Ghre_RequiredCourseServices.cs | 1 + .../Ghre/Ghre_StudyRecordServices.cs | 10 ++++-- 10 files changed, 38 insertions(+), 25 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index a1351b3a..d657a157 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -9743,7 +9743,7 @@ DESTINATION 0 新宋体,8,N 1717726229 1719381754 -((-42337,11400), (-39337,18375)) +((-42449,11400), (-39225,18375)) ((-40837,11400),(-40837,18375)) 2 1 @@ -9966,7 +9966,7 @@ DESTINATION 0 新宋体,8,N 1727337857 1727337857 -((-54786,11250), (-48786,18150)) +((-54898,11250), (-48674,18150)) ((-51786,18150),(-51786,11250)) 2 1 @@ -10010,7 +10010,7 @@ DESTINATION 0 新宋体,8,N 1738913762 1747275741 -((-45111,-30675), (-40611,-24525)) +((-45223,-30675), (-40499,-24525)) ((-44099,-30675),(-44099,-27375),(-41624,-27375),(-41624,-24525)) 2 1 @@ -10056,7 +10056,7 @@ DESTINATION 0 新宋体,8,N 1738915648 1738915648 -((-43011,-23625), (-38511,-17925)) +((-43123,-23625), (-38399,-17925)) ((-40761,-17925),(-40761,-23625)) 2 1 @@ -10078,7 +10078,7 @@ DESTINATION 0 新宋体,8,N 1738916095 1738916119 -((-53924,-23812), (-39449,-17325)) +((-54036,-23812), (-39449,-17325)) ((-51674,-17325),(-51674,-23400),(-39449,-23400)) 2 1 @@ -10100,7 +10100,7 @@ DESTINATION 0 新宋体,8,N 1738916098 1738916104 -((-53999,-31050), (-42899,-24863)) +((-54111,-31050), (-42899,-24863)) ((-51749,-31050),(-51749,-25275),(-42899,-25275)) 2 1 @@ -10122,7 +10122,7 @@ DESTINATION 0 新宋体,8,N 1741251133 1741253579 -((40058,-9675), (46058,-900)) +((39946,-9675), (46170,-900)) ((43058,-9675),(43058,-900)) 2 1 @@ -10167,7 +10167,7 @@ DESTINATION 0 新宋体,8,N 1741253476 1741253575 -((40013,-2100), (46013,5325)) +((39901,-2100), (46125,5325)) ((43013,5325),(43013,-2100)) 2 1 @@ -10189,7 +10189,7 @@ DESTINATION 0 新宋体,8,N 1741253560 1741253591 -((39309,5850), (46809,13800)) +((39197,5850), (46921,13800)) ((43059,13800),(43059,5850)) 2 1 @@ -10211,7 +10211,7 @@ DESTINATION 0 新宋体,8,N 1741255050 1741255050 -((38401,14400), (47401,22350)) +((38289,14400), (47513,22350)) ((42901,22350),(42901,14400)) 2 1 @@ -10233,7 +10233,7 @@ DESTINATION 0 新宋体,8,N 1741255952 1741255952 -((50010,-1950), (56010,5325)) +((49898,-1950), (56122,5325)) ((53010,-1950),(53010,5325)) 2 1 @@ -10277,7 +10277,7 @@ DESTINATION 0 新宋体,8,N 1747034447 1747034447 -((-15206,-37275), (-7706,-30075)) +((-15318,-37275), (-7594,-30075)) ((-11456,-37275),(-11456,-30075)) 2 1 @@ -10299,7 +10299,7 @@ DESTINATION 0 新宋体,8,N 1747035168 1747035168 -((-14943,-44850), (-7443,-37125)) +((-15055,-44850), (-7331,-37125)) ((-11193,-44850),(-11193,-37125)) 2 1 @@ -17629,7 +17629,7 @@ Shadow=0 Ghre_ExamRecord 1714104130 Administrator -1744775173 +1748569065 Administrator 考试记录 @@ -27100,7 +27100,7 @@ Shadow=0 Ghre_StudyRecord 1721036281 Administrator -1745895977 +1748569054 Administrator 培训记录 diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs index 538d9627..398a4ab4 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_CourseController.cs @@ -1,5 +1,4 @@ -using StackExchange.Profiling.Data; -using Tiobon.Core.Model.ViewModels.Extend; +using Tiobon.Core.Model.ViewModels.Extend; namespace Tiobon.Core.Api.Controllers; diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs index 8328058c..291d8967 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_ExamRecord.Dto.View.cs @@ -58,4 +58,7 @@ public class Ghre_ExamRecordDto : Ghre_ExamRecord public decimal? TotalScore { get; set; } = 0; public List Attachments { get; set; } + + public int? DataBelongID { get; set; } + public string DataBelongName { 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 2e5feed1..0bd6203b 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_StudyRecord.Dto.View.cs @@ -175,4 +175,6 @@ public class Ghre_StudyRecordDto : Ghre_StudyRecord public long? ExamRecordId { get; set; } public string StudyFinishedRule { get; set; } + public int? DataBelongID { get; set; } + public string DataBelongName { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs index 66c37425..89e70e12 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CertificateServices.cs @@ -40,6 +40,7 @@ public class Ghre_CertificateServices : BaseServices().Where(x => x.DataPrivType == "Priv" && x.MenuNo == filter.menuName).AnyAsync()) { diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs index b6b9b260..003cfdc3 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs @@ -35,11 +35,12 @@ public class Ghre_ExamRecordServices : BaseServices().Where(x => x.DataPrivType == "Priv" && x.MenuNo == filter.menuName).AnyAsync()) { var staffIds = await GetUserStaffPrivIds((int)App.User.ID); diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index 198bfc26..fd49e431 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -35,7 +35,7 @@ public class Ghre_StudyRecordServices : BaseServices