修改仓储

This commit is contained in:
2022-04-26 17:50:48 +08:00
parent 9b419aafe0
commit dc968efd1b
7 changed files with 64 additions and 49 deletions
@@ -54,20 +54,18 @@ namespace IRaCIS.Application.Services
ReviewerAckDTO attachmentViewModel)
{
var intoGroupItem = await _enrollRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.DoctorId == attachmentViewModel.DoctorId);
var intoGroupItem = (await _enrollRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.DoctorId == attachmentViewModel.DoctorId)).IfNullThrowException();
if (intoGroupItem == null) return Null404NotFound(intoGroupItem);
if (attachmentViewModel.Id != Guid.Empty)
{
await _attachmentRepository.BatchDeleteNoTrackingAsync(t => t.Id == attachmentViewModel.Id);
}
var attach = _mapper.Map<Attachment>(attachmentViewModel);
var attachment = await _attachmentRepository.AddAsync(attach);
var attachment = await _attachmentRepository.InsertFromDTOAsync(attachmentViewModel);
intoGroupItem.AttachmentId = attachment.Id;
await _enrollRepository.UpdateAsync(intoGroupItem);
//intoGroupItem.AttachmentId = attachment.Id;
await _enrollRepository.UpdateNoQueryAsync(intoGroupItem.Id,u=>new Enroll(){AttachmentId = attachment.Id});
var success = await _enrollRepository.SaveChangesAsync();
@@ -50,12 +50,11 @@ namespace IRaCIS.Application.Services
var trialDoctoritem = await _enrollRepository.FirstOrDefaultAsync(u => u.Id == addOrUpdateModel.Id);
if (trialDoctoritem == null)//insert
{
var trialExt = _mapper.Map<Enroll>(addOrUpdateModel);
await _enrollRepository.AddAsync(trialExt);
await _enrollRepository.InsertFromDTOAsync(addOrUpdateModel);
}
else//update
{
await _enrollRepository.UpdateAsync(_mapper.Map(addOrUpdateModel, trialDoctoritem));
await _enrollRepository.UpdateFromDTOAsync(addOrUpdateModel);
}
var success = await _enrollRepository.SaveChangesAsync();
return ResponseOutput.Result(success);
@@ -358,7 +357,7 @@ namespace IRaCIS.Application.Services
//更新入组表
var intoGroupList = await _enrollRepository.Where(t => t.TrialId == trialId).ToListAsync();
var intoGroupList = await _enrollRepository.Where(t => t.TrialId == trialId,true).ToListAsync();
if (confirmState == 1) //确认入组
{
@@ -368,7 +367,7 @@ namespace IRaCIS.Application.Services
{
intoGroupItem.EnrollStatus = (int)EnrollStatus.ConfirmIntoGroup;
intoGroupItem.EnrollTime = DateTime.Now;
await _enrollRepository.UpdateAsync(intoGroupItem);
await _enrollDetailRepository.AddAsync(new EnrollDetail()
{
@@ -389,7 +388,6 @@ namespace IRaCIS.Application.Services
{
intoGroupItem.EnrollStatus = (int)EnrollStatus.InviteIntoGroup;
intoGroupItem.EnrollTime = null;
await _enrollRepository.UpdateAsync(intoGroupItem);
var deleteItem = await _enrollDetailRepository.FirstOrDefaultAsync(t =>
@@ -434,7 +432,6 @@ namespace IRaCIS.Application.Services
intoGroupItem.EnrollStatus = (int)EnrollStatus.InviteIntoGroup;
intoGroupItem.EnrollTime = null;
await _enrollRepository.UpdateAsync(intoGroupItem);
var deleteItem = await _enrollDetailRepository.FirstOrDefaultAsync(t =>
t.TrialId == trialId && t.DoctorId == intoGroupItem.DoctorId &&