学习考试

SGGL/BLL/API/HSSE/APITrainingTaskService.cs

@@ -85,6 +85,8 @@ namespace BLL
                 GetDataService.CreateTrainingTaskItemByTaskId(taskId);
 
                 var getDataLists = (from x in db.Training_TaskItem
+                                    join y in db.Training_CompanyTrainingItem on x.TrainingItemCode equals y.CompanyTrainingItemCode into temp
+                                    from y in temp.DefaultIfEmpty()
                                     where x.TaskId == taskId
                                     orderby x.TrainingItemCode
                                     select new Model.TrainingTaskItemItem
@@ -94,7 +96,8 @@ namespace BLL
                                         PlanId = x.PlanId,
 										StartTime = x.StartTime,
 										EndTime =x.EndTime,
-										LearningTime=x.LearnTime,
+										LearningTime= x.LearnTime,
+                                        AttachTime= y.LearningTime,
 										VideoProgress = x.VideoProgress,
                                         PersonId = x.PersonId,
                                         TrainingItemCode = x.TrainingItemCode,
@@ -305,21 +308,23 @@ namespace BLL
                 {
                     item.LearnTime = 0;
                 }
-                item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;
-				
+                item.LearnTime = item.LearnTime.Value + (int)span.TotalSeconds;	
                 item.EndTime = endTime;
                 
 				db.SubmitChanges();
 
+                var companyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(x => x.CompanyTrainingItemCode == item.TrainingItemCode);
+                int companyTrainingItemLearnTime = companyTrainingItem?.LearningTime ?? 0; //培训教材时长（秒）
+
+
                 //如果学习时长大于培训教材时长，则关闭状态
-                if (item.VideoProgress > item.LearnTime)
+                if (item.LearnTime > companyTrainingItemLearnTime)
                 {
                     var taskModel = db.Training_Task.FirstOrDefault(x => x.TaskId == item.TaskId);
                     taskModel.States = "2";
                     db.SubmitChanges();
-                }
-
-
+                } 
+                 
                 return item;
 			}
 		}