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

重传修改

Uat_Study
hang 2022-06-28 11:11:06 +08:00
parent 32187c727f
commit 11e33a74de
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -96,6 +96,8 @@ namespace IRaCIS.Core.Application.ViewModel
public RequestReReadingType RequestReReadingType { get; set; }
public string RequestReReadingRejectReason { get; set; } = string.Empty;
public DateTime? RequestReReadingTime { get; set; }
public string RequestReReadingReason { get; set; } = string.Empty;
@ -439,6 +441,7 @@ namespace IRaCIS.Core.Application.ViewModel
public List<ConfirmReReadingDTO> ConfirmReReadingList { get; set; }
public string RequestReReadingRejectReason { get; set; } = string.Empty;
public RequestReReadingResult RequestReReadingResultEnum { get; set; }
}

6
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -326,10 +326,11 @@ namespace IRaCIS.Core.Application.Service
TaskState = TaskState.NotEffect,
Code = currentMaxCodeInt + 1,
TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)),
AllocateTime = DateTime.Now,
DoctorUserId = reReadingVisitTask.DoctorUserId,
// AllocateTime = DateTime.Now,
//DoctorUserId = reReadingVisitTask.DoctorUserId,
});
var rootReReadingTaskId = await _visitTaskReReadingRepository.Where(t => t.NewReReadingTaskId == reReadingVisitTask.Id).Select(u => u.RootReReadingTaskId).FirstOrDefaultAsync();
@ -348,6 +349,7 @@ namespace IRaCIS.Core.Application.Service
RequestReReadingUserId = _userInfo.Id,
RequestReReadingReason = generateTaskCommand.ReReadingApplyGenerateTaskCommand.RequestReReadingReason,
RequestReReadingType = generateTaskCommand.ReReadingApplyGenerateTaskCommand.RequestReReadingType,
});
//是否增加任务类别

17
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -967,12 +967,29 @@ namespace IRaCIS.Core.Application.Service
{
RequestReReadingConfirmUserId=_userInfo.Id,
RequestReReadingResultEnum= agreeReReadingCommand.RequestReReadingResultEnum,
RequestReReadingRejectReason = agreeReReadingCommand.RequestReReadingRejectReason
});
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer)
{
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
{
TaskState = TaskState.Effect
});
}
//立即分配
else if(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
{
await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == item.NewReReadingTaskId, u => new VisitTask()
{
TaskState = TaskState.Effect,
DoctorUserId=_userInfo.Id,
AllocateTime= DateTime.Now,
});
}
}

3
IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
View File

@ -44,6 +44,9 @@ namespace IRaCIS.Core.Domain.Models
public string RequestReReadingReason { get; set; } = string.Empty;
public string RequestReReadingRejectReason { get; set; } = string.Empty;
public RequestReReadingResult RequestReReadingResultEnum { get; set; }