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

suject 更改bug

Uat_Study
hang 2022-03-31 08:46:49 +08:00
parent e884485664
commit cf0c28a5ad
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs
View File

@ -161,7 +161,7 @@ namespace IRaCIS.Application.Contracts
public class UserCommand : UserInfo public class UserCommand : UserInfo
{ {
public bool IsFirstAdd { get; set; } = true;
//public string FirstName { get; set; } //public string FirstName { get; set; }
//public string LastName { get; set; } //public string LastName { get; set; }

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

@ -321,30 +321,30 @@ namespace IRaCIS.Core.Application.Service
var success = await _trialExternalUseRepository.SaveChangesAsync(); var success = await _trialExternalUseRepository.SaveChangesAsync();
var messageToSend = new MimeMessage();
//发件地址
messageToSend.From.Add(new MailboxAddress("GRR", "iracis_grr@163.com"));
//收件地址
messageToSend.To.Add(new MailboxAddress(String.Empty, needUpdate.Email));
//主题
messageToSend.Subject = $"GRR External User survey (Trial {(editTrialUserPreparation.IsJoin == false ? "Reject Success" : "Join Success")})";
var builder = new BodyBuilder();
var trialInfo = await _repository.FirstOrDefaultAsync<Trial>(t => t.Id == needUpdate.TrialId);
var sysUserInfo = await _userRepository.Where(t => t.Id == needUpdate.SystemUserId).Include(t => t.UserTypeRole).FirstOrDefaultAsync();
int verificationCode = new Random().Next(100000, 1000000);
if (sysUserInfo.IsFirstAdd)
{
await _userRepository.UpdateFromQueryAsync(t => t.Id == sysUserInfo.Id,
u => new User() { Password = MD5Helper.Md5(verificationCode.ToString()) });
}
if (editTrialUserPreparation.IsJoin == true) if (editTrialUserPreparation.IsJoin == true)
{ {
var messageToSend = new MimeMessage();
//发件地址
messageToSend.From.Add(new MailboxAddress("GRR", "iracis_grr@163.com"));
//收件地址
messageToSend.To.Add(new MailboxAddress(String.Empty, needUpdate.Email));
//主题
messageToSend.Subject = $"GRR External User survey (Trial {(editTrialUserPreparation.IsJoin == false ? "Reject Success" : "Join Success")})";
var builder = new BodyBuilder();
var trialInfo = await _repository.FirstOrDefaultAsync<Trial>(t => t.Id == needUpdate.TrialId);
var sysUserInfo = await _userRepository.Where(t => t.Id == needUpdate.SystemUserId).Include(t => t.UserTypeRole).FirstOrDefaultAsync();
int verificationCode = new Random().Next(100000, 1000000);
if (sysUserInfo.IsFirstAdd)
{
await _userRepository.UpdateFromQueryAsync(t => t.Id == sysUserInfo.Id,
u => new User() { Password = MD5Helper.Md5(verificationCode.ToString()) });
}
builder.HtmlBody = @$"<body style='font-family: 微软雅黑;padding: 0;margin: 0;'> builder.HtmlBody = @$"<body style='font-family: 微软雅黑;padding: 0;margin: 0;'>
<div style='padding-left: 40px;background: #f6f6f6'> <div style='padding-left: 40px;background: #f6f6f6'>
<div style='padding-top: 20px;padding-bottom:40px'> <div style='padding-top: 20px;padding-bottom:40px'>
@ -581,6 +581,9 @@ namespace IRaCIS.Core.Application.Service
<div> <div>
角色: {sysUserInfo.UserTypeRole.UserTypeShortName} 角色: {sysUserInfo.UserTypeRole.UserTypeShortName}
</div> </div>
<div>
拒绝原因: {editInfo.RejectReason}
</div>
</div> </div>
</div> </div>
</div> </div>

2
IRaCIS.Core.Application/Service/Visit/SubjectService.cs
View File

@ -121,7 +121,7 @@ namespace IRaCIS.Application.Services
if (subjectStatusChangeCommand.FinalSubjectVisitId != null) if (subjectStatusChangeCommand.FinalSubjectVisitId != null)
{ {
if (await _repository.AnyAsync<SubjectVisit>(t => t.SubjectId == subjectStatusChangeCommand.SubjectId && t.IsFinalVisit)) if (await _repository.AnyAsync<SubjectVisit>(t => t.SubjectId == subjectStatusChangeCommand.SubjectId && t.IsFinalVisit && t.Id != subjectStatusChangeCommand.FinalSubjectVisitId))
{ {
return ResponseOutput.NotOk("该受试者已经有访视设置为末次访视，不允许将该访视设置为末次访视"); return ResponseOutput.NotOk("该受试者已经有访视设置为末次访视，不允许将该访视设置为末次访视");
} }