zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230922

Browse Source
This commit is contained in:
李超
2023-09-22 17:36:00 +08:00
parent dece3781ec
commit 9942cdcf6f
49 changed files with 2907 additions and 2375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIBaseInfoService.cs
+2 -2
View File
@@ -491,12 +491,12 @@ namespace BLL
var getDataLists = (from x in db.Base_WorkPost
where strParam == null || x.WorkPostName.Contains(strParam)
orderby x.WorkPostName
select new Model.BaseInfoItem { BaseInfoId = x.WorkPostId.ToUpper(), BaseInfoCode = x.WorkPostCode, BaseInfoName = x.WorkPostName }).ToList();
select new Model.BaseInfoItem { BaseInfoId = x.WorkPostId , BaseInfoCode = x.WorkPostCode, BaseInfoName = x.WorkPostName }).ToList();
if (!string.IsNullOrEmpty(projectId))
{
var user = from u in db.SitePerson_Person
where u.ProjectId == projectId
select u.WorkPostId.ToUpper();
select u.WorkPostId ;
var postIds = user.Distinct();
foreach (var item in getDataLists)
SGGL/BLL/API/HSSE/APITrainingTaskService.cs
+12 -5
View File
@@ -78,6 +78,10 @@ namespace BLL
TaskItemId = x.TaskItemId,
TaskId = x.TaskId,
PlanId = x.PlanId,
StartTime = x.StartTime,
EndTime =x.EndTime,
LearnTime=x.LearnTime,
VideoProgress = x.VideoProgress,
PersonId = x.PersonId,
TrainingItemCode = x.TrainingItemCode,
TrainingItemName = x.TrainingItemName,
@@ -257,7 +261,7 @@ namespace BLL
/// </summary>
/// <param name="trainingPlanId"></param>
/// <returns>培训计划人员</returns>
public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId,DateTime startTime,DateTime endTime)
public static Model.Training_TaskItem updateTaskItemLearnTime(string taskItemId,DateTime startTime,DateTime endTime,string VideoProgress)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
@@ -270,13 +274,16 @@ namespace BLL
item.StartTime = startTime;
}
if (!item.LearnTime.HasValue)
//if (!item.LearnTime.HasValue)
//{
// item.LearnTime = 0;
//}
if (!string.IsNullOrEmpty(VideoProgress))
{
item.LearnTime = 0;
item.VideoProgress = int.Parse(VideoProgress);
}
var span = endTime.Subtract(startTime);
item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;
//item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;
item.EndTime = endTime;
db.SubmitChanges();
return item;