This commit is contained in:
夏菊 2025-04-16 17:14:43 +08:00
parent 5043a83e66
commit 4751353221
1 changed files with 27 additions and 8 deletions

View File

@ -233,10 +233,14 @@ namespace FineUIPro.Web.JDGL.Check
} }
else else
{ {
var user = projectUsers.FirstOrDefault(e => e.UserName == col3); var lstUser = col3.Split(',');
foreach (var obj in lstUser)
{
var user = projectUsers.FirstOrDefault(x => x.UserName == obj);
if (user == null) if (user == null)
{ {
result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + col3 + "]不在项目用户信息中!" + "|"; result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + obj + "]不在项目用户信息中!" + "|";
}
} }
} }
@ -410,14 +414,20 @@ namespace FineUIPro.Web.JDGL.Check
MonthPlan.PlanDate = Funs.GetNewDateTime(col2); MonthPlan.PlanDate = Funs.GetNewDateTime(col2);
} }
if (!string.IsNullOrEmpty(col3))//计划完成 if (!string.IsNullOrEmpty(col3))//五环责任人
{ {
var projectUser = projectUsers.FirstOrDefault(x => x.UserName == col3); var lstUser = col3.Split(',');
var lstUserIds = string.Empty;
foreach (var obj in lstUser)
{
var projectUser = projectUsers.FirstOrDefault(x => x.UserName == obj);
if (projectUser != null) if (projectUser != null)
{ {
MonthPlan.DutyPerson = projectUser.UserId; lstUserIds = !string.IsNullOrWhiteSpace(lstUserIds) ? $"{lstUserIds},{projectUser.UserId}" : projectUser.UserId;
} }
} }
MonthPlan.DutyPerson = lstUserIds;
}
if (!string.IsNullOrEmpty(col4))//实际完成时间 if (!string.IsNullOrEmpty(col4))//实际完成时间
{ {
MonthPlan.RealDate = Funs.GetNewDateTime(col4); MonthPlan.RealDate = Funs.GetNewDateTime(col4);
@ -608,7 +618,16 @@ namespace FineUIPro.Web.JDGL.Check
string name = string.Empty; string name = string.Empty;
if (DutyPerson != null) if (DutyPerson != null)
{ {
name = BLL.UserService.GetUserNameByUserId(DutyPerson.ToString()); var lstUser = DutyPerson.ToString().Split(',');
var lstUserIds = string.Empty;
foreach (var obj in lstUser)
{
var username = BLL.UserService.GetUserNameByUserId(obj);
if (username != null)
{
name = !string.IsNullOrWhiteSpace(name) ? $"{name},{username}" : username;
}
}
} }
return name; return name;
} }