预先提交准备测试 删除添加角色的问题
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
b4e2af4c63
commit
efa9e511c3
|
|
@ -154,6 +154,12 @@
|
||||||
</Content>
|
</Content>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="Resources\GeoLite2-City.mmdb">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
<VisualStudio>
|
<VisualStudio>
|
||||||
<UserProperties properties_4launchsettings_1json__JsonSchema="" />
|
<UserProperties properties_4launchsettings_1json__JsonSchema="" />
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 73 MiB |
|
|
@ -1510,6 +1510,20 @@
|
||||||
<param name="modality"></param>
|
<param name="modality"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetTrialVisitImageStatInfo(System.Guid)">
|
||||||
|
<summary>
|
||||||
|
获取项目影像统计,有影像的subject 数量 访视数量
|
||||||
|
</summary>
|
||||||
|
<param name="trialId"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetExportSubjectVisitImageList(IRaCIS.Core.Application.Contracts.TrialExportImageCommand)">
|
||||||
|
<summary>
|
||||||
|
批量勾选访视 进行下载
|
||||||
|
</summary>
|
||||||
|
<param name="inCommand"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetSubejectOrVisitZipInfo(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Application.Contracts.SubejctZipInfoQuery)">
|
<member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.DownloadAndUploadService.GetSubejectOrVisitZipInfo(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Application.Contracts.SubejctZipInfoQuery)">
|
||||||
<summary>
|
<summary>
|
||||||
受试者级别所有的影像
|
受试者级别所有的影像
|
||||||
|
|
|
||||||
|
|
@ -668,7 +668,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
user.IdentityUserHospitalGroupList.AddRange(addIdList.Select(t => new HospitalGroupIdentityUser() { HospitalGroupId = t, IsManager = false, IdentityUserId = user.Id }));
|
user.IdentityUserHospitalGroupList.AddRange(addIdList.Select(t => new HospitalGroupIdentityUser() { HospitalGroupId = t, IsManager = false, IdentityUserId = user.Id }));
|
||||||
|
|
||||||
|
|
||||||
var success = await _userRoleRepository.SaveChangesAsync();
|
var success = await _identityUserRepository.SaveChangesAsync();
|
||||||
|
|
||||||
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = model.Id, OptType = UserOptType.UpdateUser }, true);
|
await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = _userInfo.IdentityUserId, ActionUserName = _userInfo.UserName, TargetIdentityUserId = model.Id, OptType = UserOptType.UpdateUser }, true);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ public class UserRole : BaseFullAuditEntityNoNavigat
|
||||||
{
|
{
|
||||||
#region 导航属性
|
#region 导航属性
|
||||||
|
|
||||||
//[ForeignKey("IdentityUserId")]
|
[ForeignKey("IdentityUserId")]
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public IdentityUser IdentityUser { get; set; }
|
public IdentityUser IdentityUser { get; set; }
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,18 +72,17 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//public class IdentityUserConfigration : IEntityTypeConfiguration<IdentityUser>
|
public class IdentityUserConfigration : IEntityTypeConfiguration<IdentityUser>
|
||||||
//{
|
{
|
||||||
// //当一个实体,针对同一个类,有两个一对一导航属性,但是是不同的外键,一个外键是一对一,一个是一对多,那么需要显示配置一对多的关系
|
//当一个实体,针对同一个类,有两个一对一导航属性,但是是不同的外键,一个外键是一对一,一个是一对多,那么需要显示配置一对多的关系
|
||||||
// public void Configure(EntityTypeBuilder<IdentityUser> builder)
|
public void Configure(EntityTypeBuilder<IdentityUser> builder)
|
||||||
// {
|
{
|
||||||
// builder.HasMany(s => s.UserRoleList)
|
builder.HasMany(s => s.UserRoleList)
|
||||||
// .WithOne(t=>t.IdentityUser)
|
.WithOne(t => t.IdentityUser)
|
||||||
// .HasForeignKey(s => s.IdentityUserId);
|
.HasForeignKey(s => s.IdentityUserId);
|
||||||
|
|
||||||
|
}
|
||||||
// }
|
}
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
public class TrialIdentityUserConfigration : IEntityTypeConfiguration<TrialIdentityUser>
|
public class TrialIdentityUserConfigration : IEntityTypeConfiguration<TrialIdentityUser>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue