安全会议，教育培训接口

2026-02-06 10:23:36 +08:00
parent 75ce4655b4
commit 89bd4cc350
24 changed files with 1435 additions and 769 deletions
@@ -76,7 +76,7 @@ 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
+                                    join y in db.Training_CompanyTrainingItem on x.CompanyTrainingItemId equals y.CompanyTrainingItemId into temp
                                    from y in temp.DefaultIfEmpty()
                                    where x.TaskId == taskId
                                    orderby x.TrainingItemCode
@@ -93,7 +93,8 @@ namespace BLL
                                        PersonId = x.PersonId,
                                        TrainingItemCode = x.TrainingItemCode,
                                        TrainingItemName = x.TrainingItemName,
-                                        AttachUrl = x.AttachUrl.Replace('\\', '/'),
+                                        AttachUrl = db.AttachFile.FirstOrDefault(y => y.ToKeyId == x.CompanyTrainingItemId).AttachUrl.Replace("\\", "/"),
+                                        //AttachUrl = x.AttachUrl.Replace('\\', '/'),
                                    }).ToList();
                return getDataLists;
            }
@@ -325,6 +326,17 @@ namespace BLL
                item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;
                item.EndTime = endTime;
                db.SubmitChanges();
+                var companyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(x => x.CompanyTrainingItemCode == item.TrainingItemCode);
+                int companyTrainingItemLearnTime = companyTrainingItem?.LearningTime ?? 0; //培训教材时长（秒）
+
+                //如果学习时长大于培训教材时长，则关闭状态
+                if (item.LearnTime > companyTrainingItemLearnTime)
+                {
+                    var taskModel = db.Training_Task.FirstOrDefault(x => x.TaskId == item.TaskId);
+                    taskModel.States = "2";
+                    db.SubmitChanges();
+                }
+
                return item;
            }
        }