Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

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

@@ -264,6 +264,10 @@ 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")]
@@ -273,17 +277,29 @@ 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>();
-            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 (!string.IsNullOrEmpty(filter.Keyword))
-                if (listPath != null && listPath.Any() && listPath.Count() > 1)
+                {
-                    papers = papers.OrderBy(e => e.FILE_PATH).ToList();
+                    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;
+                }
             }
+
             ret.Data = new TrainUserPaperModel
             {
                 Nav_Papers = papers,
                 Nav_Config = config,
-                listPath = listPath
+                listPath = listPath,
+                STATUS_RECORD = STATUS
             };
             ret.IsSuccessful = true;
             ret.TotalCount = 1;