20023-08-10

This commit is contained in:
2023-08-10 11:40:02 +08:00
parent c41b3b9777
commit 02fcf5be10
82 changed files with 9031 additions and 2997 deletions
+6 -6
View File
@@ -1430,11 +1430,11 @@ namespace BLL
IdentityCard = x.IdentityCard,
ProjectId = x.ProjectId,
UnitId = x.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == x.UnitId).UnitName,
UnitName = db.Base_Unit.First(m => m.UnitId == x.UnitId).UnitName,
CertificateId = y.CertificateId,
CertificateName = db.Base_Certificate.First(z => z.CertificateId == y.CertificateId).CertificateName,
CertificateName = db.Base_Certificate.First(m => m.CertificateId == y.CertificateId).CertificateName,
WorkPostId = x.WorkPostId,
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == x.WorkPostId).WorkPostName,
WorkPostName = db.Base_WorkPost.First(m => m.WorkPostId == x.WorkPostId).WorkPostName,
CertificateNo = y.CertificateNo,
Grade = y.Grade,
SendUnit = y.SendUnit,
@@ -1442,13 +1442,13 @@ namespace BLL
LimitDate = string.Format("{0:yyyy-MM-dd}", y.LimitDate),
LimitDateD = y.LimitDate,
LateCheckDate = string.Format("{0:yyyy-MM-dd}", y.LateCheckDate),
ApprovalPerson = db.Sys_User.First(z => z.UserId == x.AuditorId).UserName,
ApprovalPerson = db.Sys_User.First(m => m.UserId == x.AuditorId).UserName,
Remark = y.Remark,
CompileMan = y.CompileMan,
CompileManName = db.Sys_User.First(z => z.UserId == y.CompileMan).UserName,
CompileManName = db.Sys_User.First(m => m.UserId == y.CompileMan).UserName,
CompileDate = string.Format("{0:yyyy-MM-dd}", y.CompileDate),
AuditDate = string.Format("{0:yyyy-MM-dd}", y.AuditDate),
AuditorName = db.Sys_User.First(z => z.UserId == x.AuditorId).UserName,
AuditorName = db.Sys_User.First(m => m.UserId == x.AuditorId).UserName,
AttachUrl = APIUpLoadFileService.getFileUrl(y.PersonQualityId, null),
}).ToList();
if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(projectId, unitId))