XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改外部用户提交

Uat_Study
hang 2022-05-18 15:27:13 +08:00
parent 7a2c3f1b01
commit 5999098820
5 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -396,7 +396,7 @@
项目外部人员 录入流程相关
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Service.TrialExternalUserService.AddOrUpdateTrialExternalUser(IRaCIS.Core.Application.ViewModel.TrialExternalUserAddOrEdit)">
<member name="M:IRaCIS.Core.Application.Service.TrialExternalUserService.AddOrUpdateTrialExternalUser(IRaCIS.Core.Application.ViewModel.TrialExternalUserAddAndSendEmail)">
<summary>
添加和更新接口 已验证邮箱和账户类型不允许添加重复项
</summary>

36
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs
View File

@ -75,7 +75,7 @@ namespace IRaCIS.Core.Application.ViewModel
}
///<summary> TrialExternalUserAddOrEdit 列表查询参数模型</summary>
public class TrialExternalUserAddOrEdit : VerifyUserAdd
public class TrialExternalUserAddOrEdit
{
public Guid? Id { get; set; }
@ -85,6 +85,17 @@ namespace IRaCIS.Core.Application.ViewModel
public string OrganizationName { get; set; } = String.Empty;
[NotDefault]
public Guid UserTypeId { get; set; }
public string Email { get; set; } = string.Empty;
public string Phone { get; set; } = string.Empty;
public string FirstName { get; set; } = string.Empty;
public string LastName { get; set; } = string.Empty;
//public bool IsSendEmail { get; set; }
@ -92,6 +103,18 @@ namespace IRaCIS.Core.Application.ViewModel
}
public class TrialExternalUserAddAndSendEmail: TrialExternalUserAddOrEdit
{
public bool IsSendEmail { get; set; }
public string BaseUrl { get; set; } = string.Empty;
public string RouteUrl { get; set; } = string.Empty;
}
public class TrialExternalUserConfirm
{
public string BaseUrl { get; set; } = string.Empty;
@ -159,18 +182,7 @@ namespace IRaCIS.Core.Application.ViewModel
}
public class VerifyUserAdd
{
[NotDefault]
public Guid UserTypeId { get; set; }
public string Email { get; set; } = string.Empty;
public string Phone { get; set; } = string.Empty;
public string FirstName { get; set; } = string.Empty;
public string LastName { get; set; } = string.Empty;
}
}

2
IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialExternalUserService.cs
View File

@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Interfaces
Task<List<TrialExternalUserView>> GetTrialExternalUserList(TrialExternalUserQuery queryTrialExternalUser);
Task<IResponseOutput> AddOrUpdateTrialExternalUser(TrialExternalUserAddOrEdit addOrEditTrialExternalUser);
Task<IResponseOutput> AddOrUpdateTrialExternalUser(TrialExternalUserAddAndSendEmail addOrEditTrialExternalUser);
Task<IResponseOutput> DeleteTrialExternalUser(Guid trialExternalUserId, bool isSystemUser,
Guid systemUserId);

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
View File

@ -59,7 +59,7 @@ namespace IRaCIS.Core.Application.Service
/// </summary>
/// <param name="addOrEditTrialExternalUser"></param>
/// <returns></returns>
public async Task<IResponseOutput> AddOrUpdateTrialExternalUser(TrialExternalUserAddOrEdit addOrEditTrialExternalUser)
public async Task<IResponseOutput> AddOrUpdateTrialExternalUser(TrialExternalUserAddAndSendEmail addOrEditTrialExternalUser)
{
if (addOrEditTrialExternalUser.Id == null)
@ -209,7 +209,7 @@ namespace IRaCIS.Core.Application.Service
[HttpPost]
public async Task<IResponseOutput> SendExternalUserJoinEmail(TrialExternalUserSendEmail sendEmail)
{
var trialInfo = await _repository.FirstOrDefaultAsync<Trial>(t => t.Id == sendEmail.TrialId);
var trialInfo = (await _repository.FirstOrDefaultAsync<Trial>(t => t.Id == sendEmail.TrialId)).IfNullThrowException();
foreach (var userInfo in sendEmail.SendUsers)
{

11
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -116,7 +116,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialExternalUserAddOrEdit, User>();
CreateMap<TrialSite, SiteStatSimpleDTO>().IncludeMembers(t => t.Site)
.ForMember(d => d.Id, u => u.MapFrom(s => s.Id))
@ -133,10 +133,6 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.UserType, u => u.MapFrom(s => s.User.UserTypeRole.UserTypeShortName))
.ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName));
CreateMap<User, UserTrialDTO>();
#endregion
@ -171,7 +167,12 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialExternalUserAddAndSendEmail, TrialExternalUser>().ReverseMap();
CreateMap<TrialExternalUserAddAndSendEmail, User>();
CreateMap<TrialExternalUser, TrialExternalUserAddOrEdit>().ReverseMap();
CreateMap<TrialExternalUserAddOrEdit, User>();
CreateMap<TrialExternalUser, TrialExternalUserView>();