diff --git a/Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamInput.cs b/Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamInput.cs index e633d668..0ca868f4 100644 --- a/Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamInput.cs +++ b/Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamInput.cs @@ -52,4 +52,6 @@ public class StaffTableData public string InDate { get; set; } public string Mail { get; set; } public string DataSource { get; set; } + + public string DataSourceLabel { get; set; } } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs index 24fea50c..92ecefcf 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs @@ -986,7 +986,7 @@ public class Ghre_ExamServices : BaseServices x.ExamId == Id); + //var staffs = await _ghre_ExamStaffServices.Query(x => x.ExamId == Id); - var ids = staffs.Select(x => Convert.ToInt32(x.StaffId)).ToList(); - var staffTableData = await QueryStaff(ids, null); + //var ids = staffs.Select(x => Convert.ToInt32(x.StaffId)).ToList(); + var staffTableData = await QueryStaff1(Id); pageData.staffTableData = staffTableData.Data; } #endregion @@ -1052,6 +1052,39 @@ public class Ghre_ExamServices : BaseServices>.OprateSuccess("查询成功!", data); } + + + public async Task>> QueryStaff1(long examId) + { + string sql = @$"SELECT D.Id, + D.CreateTime, + A.StaffID, + A.StaffName, + A.StaffNo, + A.Email Mail, + B.DeptName, + C.TitleName, + FORMAT (A.Indate, 'yyyy/MM/dd') Indate, + D.Source DataSource + FROM Ghre_ExamStaff D + LEFT JOIN Ghra_Staff A ON A.StaffID = D.StaffId + LEFT JOIN Ghro_Dept B ON A.DeptID = B.DeptID + LEFT JOIN Ghra_Title C ON A.TitleID = C.TitleID + WHERE 1 = 1 AND A.IsEnable = 1 AND D.ExamId = '{examId}' + ORDER BY D.CreateTime ASC"; + + var data = await Db.Ado.SqlQueryAsync(sql); + data.ForEach(x => + { + if (x.DataSource == "ManualRequired") + x.DataSourceLabel = "手动必修"; + else if (x.DataSource == "StudyRuleRequired") + x.DataSourceLabel = "必修规则"; + }); + + return ServiceResult>.OprateSuccess("查询成功!", data); + } + public async Task> Insert1(long id, DefaultGhre_ExamPageData pageData) { if (pageData.DateType == "ExamDate")