自主管理加分项
This commit is contained in:
@@ -37,8 +37,8 @@ namespace BLL
|
||||
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" ? "已完成" : "培训中",
|
||||
|
||||
}).ToList();
|
||||
|
||||
}).ToList();
|
||||
return getDataLists;
|
||||
}
|
||||
}
|
||||
@@ -66,14 +66,14 @@ namespace BLL
|
||||
TaskId = x.TaskId,
|
||||
PlanId = x.PlanId,
|
||||
PersonId = x.PersonId,
|
||||
StartTime = x.StartTime,
|
||||
EndTime = x.EndTime,
|
||||
LearnTime = x.LearnTime,
|
||||
VideoProgress = x.VideoProgress,
|
||||
TrainingItemCode = x.TrainingItemCode,
|
||||
StartTime = x.StartTime,
|
||||
EndTime = x.EndTime,
|
||||
LearnTime = x.LearnTime,
|
||||
VideoProgress = x.VideoProgress,
|
||||
TrainingItemCode = x.TrainingItemCode,
|
||||
TrainingItemName = x.TrainingItemName,
|
||||
AttachUrl = x.AttachUrl.Replace('\\', '/'),
|
||||
}).ToList();
|
||||
}).ToList();
|
||||
return getDataLists;
|
||||
}
|
||||
}
|
||||
@@ -111,7 +111,7 @@ namespace BLL
|
||||
if (person != null && plan.ProjectId == person.ProjectId && plan.UnitIds.Contains(person.UnitId)
|
||||
&& (string.IsNullOrEmpty(plan.WorkPostId) || plan.WorkPostId.Contains(person.WorkPostId)))
|
||||
{
|
||||
var trainType = db.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == plan.TrainTypeId);
|
||||
var trainType = db.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == plan.TrainTypeId);
|
||||
if (trainType != null)
|
||||
{
|
||||
if (!trainType.IsRepeat.HasValue || trainType.IsRepeat == false)
|
||||
@@ -212,50 +212,50 @@ namespace BLL
|
||||
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),
|
||||
States = x.States,
|
||||
States = x.States,
|
||||
}).ToList();
|
||||
return getDataLists;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
|
||||
#region 根据TrainingPlanId获取培训任务教材明细列表
|
||||
/// <summary>
|
||||
/// 根据TrainingPlanId获取培训任务教材明细列表
|
||||
/// </summary>
|
||||
/// <param name="trainingPlanId"></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))
|
||||
{
|
||||
var q = from x in db.Training_TaskItem
|
||||
where x.TaskItemId == taskItemId
|
||||
select x;
|
||||
var item = q.FirstOrDefault();
|
||||
if (!item.StartTime.HasValue)
|
||||
{
|
||||
item.StartTime = startTime;
|
||||
}
|
||||
#region 根据TrainingPlanId获取培训任务教材明细列表
|
||||
/// <summary>
|
||||
/// 根据TrainingPlanId获取培训任务教材明细列表
|
||||
/// </summary>
|
||||
/// <param name="trainingPlanId"></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))
|
||||
{
|
||||
var q = from x in db.Training_TaskItem
|
||||
where x.TaskItemId == taskItemId
|
||||
select x;
|
||||
var item = q.FirstOrDefault();
|
||||
if (!item.StartTime.HasValue)
|
||||
{
|
||||
item.StartTime = startTime;
|
||||
}
|
||||
|
||||
if (!item.LearnTime.HasValue)
|
||||
{
|
||||
item.LearnTime = 0;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(VideoProgress))
|
||||
{
|
||||
item.VideoProgress = int.Parse(VideoProgress);
|
||||
}
|
||||
var span = endTime.Subtract(startTime);
|
||||
item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;
|
||||
item.EndTime = endTime;
|
||||
db.SubmitChanges();
|
||||
return item;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
if (!item.LearnTime.HasValue)
|
||||
{
|
||||
item.LearnTime = 0;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(VideoProgress))
|
||||
{
|
||||
item.VideoProgress = int.Parse(VideoProgress);
|
||||
}
|
||||
var span = endTime.Subtract(startTime);
|
||||
item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;
|
||||
item.EndTime = endTime;
|
||||
db.SubmitChanges();
|
||||
return item;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user