Compare commits
No commits in common. "55ea7913875b7ef5c9be7323b78c6afcf677cd62" and "d3396d9683f5689ba5e00787e6df1afaf97c7abb" have entirely different histories.
55ea791387
...
d3396d9683
|
|
@ -62,7 +62,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
return new List<Type>()
|
return new List<Type>()
|
||||||
{
|
{
|
||||||
typeof(TrialUserRole),
|
typeof(TrialUserRole),
|
||||||
typeof(TrialIdentityUser),
|
|
||||||
typeof(TrialSiteSurvey),
|
typeof(TrialSiteSurvey),
|
||||||
typeof(TrialSiteUserRole),
|
typeof(TrialSiteUserRole),
|
||||||
typeof(VisitStage),
|
typeof(VisitStage),
|
||||||
|
|
@ -1729,54 +1728,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserRole)))
|
|
||||||
{
|
|
||||||
var type = GetEntityAuditOpt(item);
|
|
||||||
|
|
||||||
var entity = item.Entity as UserRole;
|
|
||||||
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
|
|
||||||
await InsertInspection<UserRole>(entity, type, x => new InspectionConvertDTO
|
|
||||||
{
|
|
||||||
IsDistinctionInterface = type == AuditOpt.Update ? true : false,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 项目参与人员
|
|
||||||
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialIdentityUser)))
|
|
||||||
{
|
|
||||||
var type = GetEntityAuditOpt(item);
|
|
||||||
var entity = item.Entity as TrialIdentityUser;
|
|
||||||
string extraIndentification = string.Empty;
|
|
||||||
|
|
||||||
var identityUser = await _dbContext.IdentityUser.AsNoTracking().Where(x => x.Id == entity.IdentityUserId).FirstOrDefaultAsync();
|
|
||||||
|
|
||||||
//if (type == AuditOpt.Update)
|
|
||||||
//{
|
|
||||||
// extraIndentification = "/" + entity.IsDeleted.ToString();
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
|
|
||||||
await InsertInspection<TrialIdentityUser>(entity, type, x => new InspectionConvertDTO
|
|
||||||
{
|
|
||||||
//IsDistinctionInterface = true ,
|
|
||||||
TrialId = x.TrialId,
|
|
||||||
ObjectRelationParentId = x.TrialId,
|
|
||||||
ExtraIndentification = extraIndentification,
|
|
||||||
//ObjectRelationParentId2 = x.IdentityUserId,
|
|
||||||
},new {
|
|
||||||
|
|
||||||
identityUser.FullName,
|
|
||||||
identityUser.EMail,
|
|
||||||
identityUser.Code,
|
|
||||||
identityUser.UserCode,
|
|
||||||
identityUser.UserName,
|
|
||||||
identityUser.DepartmentName,
|
|
||||||
identityUser.Phone,
|
|
||||||
identityUser.OrganizationName,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// 项目人员
|
// 项目人员
|
||||||
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole)))
|
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole)))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue