master
xiaochanghai 1 month ago
parent dc785af2da
commit 11fd08c6cd
  1. 3
      Tiobon.Core.Model/View/Ghre/Ghre_SurveyQuestionPool.Dto.View.cs
  2. 2
      Tiobon.Core.Services/BASE/BaseServices.cs
  3. 3
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  4. 3
      Tiobon.Core.Services/Ghre/Ghre_SurveyQuestionPoolServices.cs

@ -31,4 +31,7 @@ public class Ghre_SurveyQuestionPoolDto : Ghre_SurveyQuestionPool
/// 修改信息 /// 修改信息
/// </summary> /// </summary>
public string UpdateDataInfo { get; set; } public string UpdateDataInfo { get; set; }
public string BuiltInLabel { get; set; }
} }

@ -1368,7 +1368,7 @@ WHERE ParaMasterId IN (SELECT ParaMasterId
'GHRPara', 'GHRPara',
'Train', 'Train',
'Resume', 'Resume',
'GHRAttend','Performance')) 'GHRAttend','Performance','Survey'))
AND IsEnable = 1 AND IsEnable = 1
ORDER BY SortNo ASC"; ORDER BY SortNo ASC";
list = DbAccess.QueryList<Ghrs_ParaDetail>(sql); list = DbAccess.QueryList<Ghrs_ParaDetail>(sql);

@ -1491,6 +1491,8 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
data.IsOpen = entity.IsOPenLabel; data.IsOpen = entity.IsOPenLabel;
data.ValidityPeriod = entity.ValidityPeriod; data.ValidityPeriod = entity.ValidityPeriod;
data.CourseSceneName = entity.CourseSceneName; data.CourseSceneName = entity.CourseSceneName;
data.TeacherName = entity.TeacherName;
data.Type = "Course";
//必修人数 //必修人数
var RequiredCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && (x.CourseType == "ManualRequired" || x.CourseType == "Required")).CountAsync(); var RequiredCount = await Db.Queryable<Ghre_StudyRecord>().Where(x => x.CourseId == id && (x.CourseType == "ManualRequired" || x.CourseType == "Required")).CountAsync();
@ -1716,6 +1718,7 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
data.Courses = Courses; data.Courses = Courses;
data.StandardHour = entity.StandardHour; data.StandardHour = entity.StandardHour;
data.CreditPoints = entity.CreditPoints; data.CreditPoints = entity.CreditPoints;
data.Type = "CourseScene";
//必修人数 //必修人数
var RequiredCount = await Db.Queryable<Ghre_StudyRecord>() var RequiredCount = await Db.Queryable<Ghre_StudyRecord>()

@ -43,7 +43,8 @@ public class Ghre_SurveyQuestionPoolServices : BaseServices<Ghre_SurveyQuestionP
result.result.DT_TableDataT1.ForEach(async x => result.result.DT_TableDataT1.ForEach(async x =>
{ {
x.QuestionType = await GetParaLabel("QuestionType", x.QuestionType); x.BuiltInLabel = x.BuiltIn == 1 ? "是" : "否";
x.QuestionType = await GetParaLabel("SurveyQuestionType", x.QuestionType);
}); });

Loading…
Cancel
Save