diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_SurveyQuestionPool.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_SurveyQuestionPool.Dto.View.cs index 7f599050..00fa6c47 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_SurveyQuestionPool.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_SurveyQuestionPool.Dto.View.cs @@ -31,4 +31,7 @@ public class Ghre_SurveyQuestionPoolDto : Ghre_SurveyQuestionPool /// 修改信息 /// public string UpdateDataInfo { get; set; } + + + public string BuiltInLabel { get; set; } } diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index 40137386..00114e78 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -1368,7 +1368,7 @@ WHERE ParaMasterId IN (SELECT ParaMasterId 'GHRPara', 'Train', 'Resume', - 'GHRAttend','Performance')) + 'GHRAttend','Performance','Survey')) AND IsEnable = 1 ORDER BY SortNo ASC"; list = DbAccess.QueryList(sql); diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs index 1a306bfb..751388fb 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs @@ -1491,6 +1491,8 @@ public class Ghre_CourseServices : BaseServices().Where(x => x.CourseId == id && (x.CourseType == "ManualRequired" || x.CourseType == "Required")).CountAsync(); @@ -1716,6 +1718,7 @@ public class Ghre_CourseServices : BaseServices() diff --git a/Tiobon.Core.Services/Ghre/Ghre_SurveyQuestionPoolServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SurveyQuestionPoolServices.cs index 547ccd4b..12034437 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_SurveyQuestionPoolServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_SurveyQuestionPoolServices.cs @@ -43,7 +43,8 @@ public class Ghre_SurveyQuestionPoolServices : BaseServices { - x.QuestionType = await GetParaLabel("QuestionType", x.QuestionType); + x.BuiltInLabel = x.BuiltIn == 1 ? "是" : "否"; + x.QuestionType = await GetParaLabel("SurveyQuestionType", x.QuestionType); });