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

PI 审核

Uat_Study
hang 2023-07-13 09:34:23 +08:00
parent 888dfbcafb
commit a85255b5fd
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -476,6 +476,8 @@ namespace IRaCIS.Core.Application.ViewModel
public UserTypeEnum UserTypeEnum { get; set; }
}

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

@ -276,6 +276,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
//发送对话
var addDialig = _mapper.Map<PIAudit>(incommand);
addDialig.PIAuditImagePath = visitTask.PIAuditImagePath;
await _PIAuditRepository.AddAsync(addDialig);
await _visitTaskRepository.SaveChangesAsync();
@ -292,7 +294,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(t => t.Id == incommand.VisitTaskId);
visitTask.IsEnrollment = incommand.IsEnrollment != null ? incommand.IsEnrollment : visitTask.IsEnrollment;
visitTask.IsPDConfirm = incommand.IsPDConfirm != null ? incommand.IsPDConfirm : visitTask.IsPDConfirm;
visitTask.LatestReplyUserId = _userInfo.Id;
visitTask.LatestReplyTime = DateTime.Now;
await _visitTaskRepository.SaveChangesAsync();
@ -1500,7 +1503,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
return ResponseOutput.NotOk(_localizer["VisitTask_NoImageReturn"]);
}
if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit || task.ReadingTaskState == ReadingTaskState.HaveSigned)
if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit /*|| task.ReadingTaskState == ReadingTaskState.HaveSigned*/)
{
//---仅仅允许针对生效、未完成的访视任务进行退回操作，请刷新页面数据
return ResponseOutput.NotOk(_localizer["VisitTask_NonEffectiveTaskCannotBeReturned"]);

2
IRaCIS.Core.Domain/Allocation/PIAudit.cs
View File

@ -55,7 +55,7 @@ namespace IRaCIS.Core.Domain.Models
try
{
return this.PIAuditImagePath.Trim().Split('|').ToList();
return this.PIAuditImagePath?.Trim().Split('|').ToList();
}
catch (Exception)
{

2
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -437,7 +437,7 @@ namespace IRaCIS.Core.Domain.Models
try
{
return this.PIAuditImagePath.Trim().Split('|').ToList();
return this.PIAuditImagePath?.Trim().Split('|').ToList();
}
catch (Exception)
{