1
This commit is contained in:
@@ -484,8 +484,7 @@ namespace BLL
|
||||
//获取有邮箱的用户
|
||||
var userIds = BLL.UserService.GetUserHaveEmailList();
|
||||
|
||||
//userIds = userIds.Where(x => x.UserName == "张邦兴" || x.UserName == "申银行").ToList();
|
||||
//userIds = userIds.Where(x => x.UserName == "白金潮" || x.UserName == "申银行").ToList();
|
||||
//userIds = userIds.Where(x => x.UserName == "申银行").ToList();
|
||||
if (userIds.Any() && lstOverdue.Any())
|
||||
{
|
||||
//int allnum = 0;
|
||||
@@ -513,7 +512,7 @@ namespace BLL
|
||||
StringBuilder tbodyStr = new StringBuilder();
|
||||
int index = 1;
|
||||
//责任人为本人
|
||||
var acceptanceItems = lstProjectOverdue.Where(x => x.User_AcceptanceUserId.Contains(user.UserId)).OrderByDescending(x => x.DateDiffDays).ToList();
|
||||
var acceptanceItems = lstProjectOverdue.Where(x => !string.IsNullOrWhiteSpace(x.User_AcceptanceUserId) && x.User_AcceptanceUserId.Contains(user.UserId)).OrderByDescending(x => x.DateDiffDays).ToList();
|
||||
if (acceptanceItems.Any())
|
||||
{
|
||||
foreach (var item in acceptanceItems)
|
||||
@@ -533,7 +532,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
//跟踪人为本人--x.User_ReceiveUserId != null && x.User_ReceiveUserId != "" &&
|
||||
var receiveItems = lstProjectOverdue.Where(x => x.User_ReceiveUserId.Contains(user.UserId) && x.DateDiffDays > -1).OrderByDescending(x => x.DateDiffDays).ToList();
|
||||
var receiveItems = lstProjectOverdue.Where(x => !string.IsNullOrWhiteSpace(x.User_ReceiveUserId) && x.User_ReceiveUserId.Contains(user.UserId) && x.DateDiffDays > -1).OrderByDescending(x => x.DateDiffDays).ToList();
|
||||
if (receiveItems.Any())
|
||||
{
|
||||
foreach (var item in receiveItems)
|
||||
@@ -543,7 +542,7 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
//抄送人为本人
|
||||
var csUserItems = lstProjectOverdue.Where(x => x.User_CsUserIds.Contains(user.UserId)).OrderByDescending(x => x.DateDiffDays).ToList();
|
||||
var csUserItems = lstProjectOverdue.Where(x =>!string.IsNullOrWhiteSpace(x.User_CsUserIds)&& x.User_CsUserIds.Contains(user.UserId)).OrderByDescending(x => x.DateDiffDays).ToList();
|
||||
if (csUserItems.Any())
|
||||
{
|
||||
foreach (var item in csUserItems)
|
||||
@@ -641,7 +640,7 @@ namespace BLL
|
||||
lstProjectOverdue1.AddRange(lstProjectOverdue7);
|
||||
foreach (var item in lstProjectOverdue1)
|
||||
{
|
||||
if (!item.User_CsUserIds.Contains(user.UserId))
|
||||
if (!string.IsNullOrWhiteSpace(item.User_CsUserIds) && !item.User_CsUserIds.Contains(user.UserId))
|
||||
{
|
||||
index++;
|
||||
tbodyStr.Append($"<tr><td>{index}</td><td>事项逾期</td><td>{item.UnitName}</td><td>{item.GJSXID}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.QuestionTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
|
||||
@@ -655,7 +654,7 @@ namespace BLL
|
||||
index = 0;
|
||||
foreach (var item in lstProjectOverdue14)
|
||||
{
|
||||
if (!item.User_CsUserIds.Contains(user.UserId))
|
||||
if (!string.IsNullOrWhiteSpace(item.User_CsUserIds) && !item.User_CsUserIds.Contains(user.UserId))
|
||||
{
|
||||
index++;
|
||||
tbodyStr.Append($"<tr><td>{index}</td><td>事项逾期</td><td>{item.UnitName}</td><td>{item.GJSXID}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.QuestionTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
|
||||
|
||||
Reference in New Issue
Block a user