diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs index b4c103c..08f4a6b 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs @@ -264,6 +264,10 @@ namespace APT.SC.WebApi.Controllers.Api.SE /// 课件 考试按这个为 下一题 依据 /// public List listPath { get; set; } + /// + /// 培训记录状态 + /// + public SETrainRecordStatus STATUS_RECORD { get; set; } } [HttpPost, Route("GetUserPapers")] @@ -273,17 +277,29 @@ namespace APT.SC.WebApi.Controllers.Api.SE var config = GetEntity(t => true); var ret = new JsonActionResult(); List listPath = new List(); - if (papers != null && papers.Any() && !string.IsNullOrEmpty(filter.Keyword)) + SETrainRecordStatus STATUS = SETrainRecordStatus.草稿; + if (papers != null && papers.Any()) { - listPath = papers.Select(e => e.FILE_PATH).Distinct().ToList(); - if (listPath != null && listPath.Any() && listPath.Count() > 1) - papers = papers.OrderBy(e => e.FILE_PATH).ToList(); + if (!string.IsNullOrEmpty(filter.Keyword)) + { + listPath = papers.Select(e => e.FILE_PATH).Distinct().ToList(); + if (listPath != null && listPath.Any() && listPath.Count() > 1) + papers = papers.OrderBy(e => e.FILE_PATH).ToList(); + } + + var record = GetEntity(papers[0].RECORD_ID); + if (record!=null) + { + STATUS=record.STATUS; + } } + ret.Data = new TrainUserPaperModel { Nav_Papers = papers, Nav_Config = config, - listPath = listPath + listPath = listPath, + STATUS_RECORD = STATUS }; ret.IsSuccessful = true; ret.TotalCount = 1;