lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序接口、培训计划界面调优

Browse Source
This commit is contained in:
夏菊
2025-03-05 17:00:55 +08:00
parent e975ddbf1d
commit 02ba872cee
20 changed files with 422 additions and 1637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APITrainingTaskService.cs
+17 -10
View File
@@ -12,9 +12,9 @@ namespace BLL
/// </summary>
/// <param name="projectId"></param>
/// <param name="personId"></param>
/// <param name="states">1-培训中；2-已完成</param>
/// <param name="isRetakeCourse">是否重修：1：重修任务 、0：日常培训任务</param>
/// <returns></returns>
public static List<Model.TrainingTaskItem> getTrainingTaskListByProjectIdPersonId(string projectId, string personId)
public static List<Model.TrainingTaskItem> getTrainingTaskListByProjectIdPersonId(string projectId, string personId, string isRetakeCourse)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -26,25 +26,29 @@ namespace BLL
select new Model.TrainingTaskItem
{
TaskId = x.TaskId,
//PlanId = x.PlanId,
PlanId = x.PlanId,
PlanCode = y.PlanCode,
PlanName = y.PlanName,
TrainStartDate = string.Format("{0:yyyy-MM-dd HH:mm}", y.TrainStartDate),
TeachAddress = y.TeachAddress,
//PersonId = x.UserId,
PersonId = x.UserId,
PersonName = db.SitePerson_Person.FirstOrDefault(p => p.PersonId == x.UserId).PersonName,
TaskDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TaskDate),
TrainTypeName = db.Base_TrainType.FirstOrDefault(b => b.TrainTypeId == y.TrainTypeId).TrainTypeName,
TrainLevelName = db.Base_TrainLevel.FirstOrDefault(b => b.TrainLevelId == y.TrainLevelId).TrainLevelName,
PlanStatesName = y.States == "3" ? "已完成" : "培训中",
IsRetakeCourse = y.IsRetakeCourse == 1 ? 1 : 0,
}).ToList();
if (!string.IsNullOrWhiteSpace(isRetakeCourse))
{
getDataLists = getDataLists.Where(x => x.IsRetakeCourse == int.Parse(isRetakeCourse)).ToList();
}
return getDataLists;
}
}
#endregion
#region 根据TaskId获取培训任务教材明细列表
#region 根据TaskId获取培训任务教材列表
/// <summary>
/// 根据TaskId获取培训任务列表
/// </summary>
@@ -222,12 +226,15 @@ namespace BLL
#region 根据TrainingPlanId获取培训任务教材明细列表
#region 维护任务学习时长
/// <summary>
/// 根据TrainingPlanId获取培训任务教材明细列表
/// 维护任务学习时长
/// </summary>
/// <param name="trainingPlanId"></param>
/// <returns>培训计划人员</returns>
/// <param name="taskItemId"></param>
/// <param name="startTime"></param>
/// <param name="endTime"></param>
/// <param name="VideoProgress"></param>
/// <returns></returns>
public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId, DateTime startTime, DateTime endTime, string VideoProgress)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))