|
@@ -2830,12 +2830,47 @@ public class OrderController : BaseController
|
|
|
return rspModel;
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 更新甄别提起截至时限
|
|
|
- /// </summary>
|
|
|
- /// <param name="dto"></param>
|
|
|
- /// <returns></returns>
|
|
|
- [HttpPut("order_screen_endtime")]
|
|
|
+ /// <summary>
|
|
|
+ /// 甄别详情
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="id"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpGet("screen/visitdetail/{id}")]
|
|
|
+ public async Task<OrderScreenListDto> VisitDetailScreenEntity(string id)
|
|
|
+ {
|
|
|
+ var model = await _orderScreenRepository.Queryable(canView: false)
|
|
|
+ .Includes(x => x.Order)
|
|
|
+ .Includes(x => x.Workflow, d => d.Steps)
|
|
|
+ .Includes(x => x.Visit, d => d.Order)
|
|
|
+ .FirstAsync(x => x.VisitDetailId == id);
|
|
|
+ var rspModel = _mapper.Map<OrderScreenListDto>(model);
|
|
|
+ //rspModel.IsCanHandle = model.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
|
|
|
+ rspModel.IsCanHandle = model.Workflow?.IsCanHandle(
|
|
|
+ _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles) ?? false;
|
|
|
+ if (model.Status == EScreenStatus.SendBack && model.SendBackApply)
|
|
|
+ rspModel.IsCanHandle = false;
|
|
|
+ rspModel.Handle = false;
|
|
|
+ if (!string.IsNullOrEmpty(rspModel.WorkflowId))
|
|
|
+ {
|
|
|
+ rspModel.Handle = await _workflowDomainService.CheckCurrentIsStartStepAsync(rspModel.WorkflowId, _sessionContext.RequiredUserId,
|
|
|
+ _sessionContext.RequiredOrgId, HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (rspModel.FileJson != null && rspModel.FileJson.Any())
|
|
|
+ {
|
|
|
+ var ids = rspModel.FileJson.Select(x => x.Id).ToList();
|
|
|
+ rspModel.Files = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
|
|
|
+ }
|
|
|
+
|
|
|
+ return rspModel;
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 更新甄别提起截至时限
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="dto"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpPut("order_screen_endtime")]
|
|
|
[LogFilter("更新甄别提起截至时限")]
|
|
|
public async Task Update([FromBody] OrderScreenEndTimeDto dto)
|
|
|
{
|