wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:ebe74f333d1932703efa682c5601bfbaeb738c01
Branches Tags
wyw:master
..
compare: wyw:06a25b01a1036c3fea2d827e4f1797a49227a90e
Branches Tags
wyw:master

No commits in common. "ebe74f333d1932703efa682c5601bfbaeb738c01" and "06a25b01a1036c3fea2d827e4f1797a49227a90e" have entirely different histories.
ebe74f333d ... 06a25b01a1

1 changed files with 5 additions and 21 deletions
Show Stats Expand all files Collapse all files

26
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
View File

@ -264,10 +264,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
/// 课件 考试按这个为 下一题 依据
/// </summary>
public List<string> listPath { get; set; }
/// <summary>
/// 培训记录状态
/// </summary>
public SETrainRecordStatus STATUS_RECORD { get; set; }
}
[HttpPost, Route("GetUserPapers")]
@ -277,29 +273,17 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var config = GetEntity<T_SE_SECONFIG>(t => true);
var ret = new JsonActionResult<TrainUserPaperModel>();
List<string> listPath = new List<string>();
SETrainRecordStatus STATUS = SETrainRecordStatus.草稿;
if (papers != null && papers.Any())
if (papers != null && papers.Any() && !string.IsNullOrEmpty(filter.Keyword))
{
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<T_SE_TRAIN_RECORD>(papers[0].RECORD_ID);
if (record!=null)
{
STATUS=record.STATUS;
}
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();
}
ret.Data = new TrainUserPaperModel
{
Nav_Papers = papers,
Nav_Config = config,
listPath = listPath,
STATUS_RECORD = STATUS
listPath = listPath
};
ret.IsSuccessful = true;
ret.TotalCount = 1;