lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2023-10-07 17:43:32 +08:00
parent 98345cb94f
commit ac0efd6f37
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SGGL/BLL/API/HSSE/APICheckSpecialService.cs
View File

@ -55,8 +55,8 @@ namespace BLL
QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType), QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType),
ResponsibleMan = x.ResponsibleMan, ResponsibleMan = x.ResponsibleMan,
ReceiveMan = x.ReceiveMan ReceiveMan = x.ReceiveMan,
ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan)
}; };
return getInfo.FirstOrDefault(); return getInfo.FirstOrDefault();
@ -97,8 +97,8 @@ namespace BLL
QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType), QuestionTypeName = UnitService.GetQuestionTypeId(x.QuestionType),
ResponsibleMan = x.ResponsibleMan, ResponsibleMan = x.ResponsibleMan,
ReceiveMan = x.ReceiveMan ReceiveMan = x.ReceiveMan,
ReceiveManName = UserService.getUserNamesUserIds(x.ReceiveMan)
}; };
return getInfo.FirstOrDefault(); return getInfo.FirstOrDefault();
@ -122,7 +122,7 @@ namespace BLL
var getCheckSpecial = from x in db.Check_CheckSpecial var getCheckSpecial = from x in db.Check_CheckSpecial
where x.ProjectId == projectId && x.States ==states where x.ProjectId == projectId && x.States ==states
//当前保存人、审核人、确认人能看到 //当前保存人、审核人、确认人能看到
&&(x.CompileMan==userid || x.ResponsibleMan==userid || userid.Contains(x.ReceiveMan)) &&(x.CompileMan==userid || x.ResponsibleMan==userid || userid.Split(',').Contains(x.ReceiveMan))
orderby x.CheckSpecialCode descending orderby x.CheckSpecialCode descending
select new Model.CheckSpecialItem select new Model.CheckSpecialItem
{ {
@ -146,7 +146,8 @@ namespace BLL
CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName, CompileManName = db.Sys_User.First(u => u.UserId == x.CompileMan).UserName,
States = x.States, States = x.States,
AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null), AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null),
ReceiveMan=x.ResponsibleMan ReceiveMan=x.ReceiveMan,
ReceiveManName= UserService.getUserNamesUserIds(x.ReceiveMan)
}; };
return getCheckSpecial.ToList(); return getCheckSpecial.ToList();
} }
@ -185,7 +186,8 @@ namespace BLL
WorkAreaId=newItem.WorkAreaId, WorkAreaId=newItem.WorkAreaId,
QuestionType=newItem.QuestionType, QuestionType=newItem.QuestionType,
//审核人 //审核人
ResponsibleMan=newItem.ResponsibleMan ResponsibleMan=newItem.ResponsibleMan,
ReceiveMan=newItem.ReceiveMan
}; };
//if (newItem.States != Const.State_1) //if (newItem.States != Const.State_1)
//{ //{

1
SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs
View File

@ -245,5 +245,6 @@ namespace Model
/// </summary> /// </summary>
public string ReceiveMan { get; set; } public string ReceiveMan { get; set; }
public string ReceiveManName { get; set; }
} }
} }