LastName FirstName 修改为FullName 精简代码

This commit is contained in:
2022-04-22 18:00:46 +08:00
parent 8b3b59c40d
commit dc076c5231
10 changed files with 32 additions and 51 deletions
@@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Services
ConfirmUserId = confirm.ConfirmUserId,
ConfirmTime = confirm.ConfirmTime,
RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
RealName = trialUser.User.FullName,
UserName = trialUser.User.UserName,
UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
};
@@ -180,7 +180,7 @@ namespace IRaCIS.Core.Application.Services
ConfirmUserId = confirm.ConfirmUserId,
ConfirmTime = confirm.ConfirmTime,
RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
RealName = trialUser.User.FullName,
UserName = trialUser.User.UserName,
UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
@@ -318,7 +318,7 @@ namespace IRaCIS.Core.Application.Services
ConfirmUserId = confirm.ConfirmUserId,
ConfirmTime = confirm.ConfirmTime,
RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
RealName = trialUser.User.FullName,
UserName = trialUser.User.UserName,
UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
@@ -351,7 +351,7 @@ namespace IRaCIS.Core.Application.Services
ConfirmUserId = confirm.ConfirmUserId,
ConfirmTime = confirm.ConfirmTime,
RealName = trialUser.User.LastName + " / " + trialUser.User.FirstName,
RealName = trialUser.User.FullName,
UserName = trialUser.User.UserName,
UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
@@ -375,7 +375,7 @@ namespace IRaCIS.Core.Application.Services
public async Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId)
{
return await _repository.Where<TrialUser>(t => t.TrialId == trialId)
.Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.User.LastName + " / " + t.User.FirstName, UserName = t.User.UserName })
.Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.User.FullName, UserName = t.User.UserName })
.ToListAsync();
}
@@ -605,7 +605,7 @@ namespace IRaCIS.Core.Application.Services
{
UserId = t.UserId,
UserName = t.User.UserName,
RealName = t.User.LastName + " / " + t.User.FirstName,
RealName = t.User.FullName,
UserTypeShortName = t.User.UserTypeRole.UserTypeShortName,
TrialDocumentCount = t.Trial.TrialDocumentList.Count(u => u.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == t.User.UserTypeId)),
TrialDocumentConfirmedCount = t.Trial.TrialDocumentList.SelectMany(u => u.TrialDocConfirmedUserList).Count(k => k.ConfirmUserId == t.UserId),
@@ -41,7 +41,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialDocUserTypeConfirmedUser, TrialDocumentUserConfirmView>()
.ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName))
.ForMember(d => d.RealName, c => c.MapFrom(t => t.User.LastName + " / " + t.User.FirstName));
.ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName));
//CreateMap<SystemDocConfirmedUser, SystemDocumentUserConfirmView>()
// .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName))