This commit is contained in:
2024-05-16 10:17:34 +08:00
parent d17354f244
commit 145844fbed
21 changed files with 551 additions and 294 deletions
@@ -204,17 +204,18 @@ namespace FineUIPro.Web.Evaluation
userList.Add(userRepresentative.First());
}
var ctk = from x in Funs.DB.Sys_User
join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
select x;
if (ctk.Count() > 0)
{
foreach (var c in ctk)
{
userList.Add(c);
}
}
// CT/K部门去掉
//var ctk = from x in Funs.DB.Sys_User
// join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
// where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
// select x;
//if (ctk.Count() > 0)
//{
// foreach (var c in ctk)
// {
// userList.Add(c);
// }
//}
var ctss = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
@@ -744,7 +745,7 @@ namespace FineUIPro.Web.Evaluation
if (eva.IsOthers == true)
{
reportModel.GetRow(46).GetCell(1).SetCellValue(eva.OthersNum != null ? eva.OthersNum.Value.ToString() : "0");
reportModel.GetRow(46).GetCell(1).SetCellValue(eva.OtherDef);
reportModel.GetRow(45).GetCell(2).SetCellValue(txtNo);
reportModel.GetRow(45).GetCell(2).CellStyle.SetFont(content_Font);
}