master
xiaochanghai 1 year ago
parent 744b6fcced
commit e23a18102e
  1. 38
      Tiobon.Core.Services/Ghre/Ghre_ExamServices.cs
  2. 8
      Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs

@ -413,39 +413,44 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
label = "工号", label = "工号",
field = "StaffNo", field = "StaffNo",
align = "center", align = "center",
width=100
}, },
new DefaultGhre_ExamColumn() new DefaultGhre_ExamColumn()
{ {
label = "姓名", label = "姓名",
field = "StaffName", field = "StaffName",
align = "center", align = "center",
width=100
}, new DefaultGhre_ExamColumn() }, new DefaultGhre_ExamColumn()
{ {
label = "部门", label = "部门",
field = "DeptName", field = "DeptName",
align = "center", align = "center",
width=100
}, new DefaultGhre_ExamColumn() }, new DefaultGhre_ExamColumn()
{ {
label = "岗位", label = "岗位",
field = "TitleName", field = "TitleName",
align = "center", align = "center",
width=100
}, new DefaultGhre_ExamColumn() }, new DefaultGhre_ExamColumn()
{ {
label = "入职日期", label = "入职日期",
field = "InDate", field = "InDate",
align = "center", align = "center",
width=100
}, new DefaultGhre_ExamColumn() }, new DefaultGhre_ExamColumn()
{ {
label = "邮箱", label = "邮箱",
field = "Mail", field = "Mail",
align = "center", align = "center",
width=200 width=100
}, new DefaultGhre_ExamColumn() }, new DefaultGhre_ExamColumn()
{ {
label = "数据来源", label = "数据来源",
field = "DataSource", field = "DataSource",
align = "center", align = "center",
width=200 width=100
} }
}; };
#endregion #endregion
@ -467,14 +472,29 @@ public class Ghre_ExamServices : BaseServices<Ghre_Exam, Ghre_ExamDto, InsertGhr
public async Task<ServiceResult<List<StaffTableData>>> QueryStaff(List<int> Ids, string type) public async Task<ServiceResult<List<StaffTableData>>> QueryStaff(List<int> Ids, string type)
{ {
string sql = @"SELECT A.StaffID,
A.StaffName,
A.StaffNo,
A.Email Mail,
B.DeptName,
C.TitleName,
FORMAT(A.Indate, 'yyyy/MM/dd') Indate
FROM Ghra_Staff A
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 ";
sql += $"AND StaffID IN({string.Join(",", Ids)});";
var list = await _ghra_StaffSceneServices.Query(x => Ids.Contains(x.StaffID)); var list = await _ghra_StaffSceneServices.Query(x => Ids.Contains(x.StaffID));
var data = list.Select(x => new StaffTableData()
{ var data = Db.Ado.SqlQuery<StaffTableData>(sql);
StaffID = x.StaffID, //var data = list.Select(x => new StaffTableData()
StaffNo = x.StaffNo, //{
StaffName = x.StaffName, // StaffID = x.StaffID,
Mail = x.Email // StaffNo = x.StaffNo,
}).ToList(); // StaffName = x.StaffName,
// Mail = x.Email
//}).ToList();
return ServiceResult<List<StaffTableData>>.OprateSuccess("查询成功!", data); return ServiceResult<List<StaffTableData>>.OprateSuccess("查询成功!", data);
} }

@ -1,4 +1,5 @@
 
using System.Collections.Generic;
using System.Data; using System.Data;
using AgileObjects.AgileMapper; using AgileObjects.AgileMapper;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -215,6 +216,13 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
.OrderBy(filter.orderBy) .OrderBy(filter.orderBy)
.ToPageListAsync(filter.pageNum, filter.pageSize, totalCount); .ToPageListAsync(filter.pageNum, filter.pageSize, totalCount);
data.ForEach(async x =>
{
x.DifficultyLevelLabel = await GetParaLabel("DifficultyLevel", x.DifficultyLevel);
x.QuestionTypeLabel = await GetParaLabel("QuestionType", x.QuestionType);
});
return new ServicePageResult<Ghre_QuestionDto>(filter.pageNum, totalCount, filter.pageSize, data); return new ServicePageResult<Ghre_QuestionDto>(filter.pageNum, totalCount, filter.pageSize, data);
} }

Loading…
Cancel
Save