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

111

This commit is contained in:
李超 2024-05-22 16:57:23 +08:00
parent 0aac9cb8fc
commit b0b47e4c83
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SGGL/BLL/API/HSSE/APITestRecordService.cs
View File

@ -347,9 +347,9 @@ namespace BLL
} }
} }
//// 获取得到的单选题、多选题、判断题 数量 //// 获取得到的单选题、多选题、判断题 数量
int getDiffTestType1Count = sumTestType1Count - getTestTrainingItemList.Where(x => x.TestType == "1").Count(); int getDiffTestType1Count = sumTestType1Count;// - getTestTrainingItemList.Where(x => x.TestType == "1").Count();
int getDiffTestType2Count = sumTestType2Count - getTestTrainingItemList.Where(x => x.TestType == "2").Count(); int getDiffTestType2Count = sumTestType2Count;// - getTestTrainingItemList.Where(x => x.TestType == "2").Count();
int getDiffTestType3Count = sumTestType3Count - getTestTrainingItemList.Where(x => x.TestType == "3").Count(); int getDiffTestType3Count = sumTestType3Count;// - getTestTrainingItemList.Where(x => x.TestType == "3").Count();
if (getDiffTestType1Count > 0 || getDiffTestType2Count > 0 || getDiffTestType3Count > 0) if (getDiffTestType1Count > 0 || getDiffTestType2Count > 0 || getDiffTestType3Count > 0)
{ {
var getTestTrainingItemNulls = getTestTrainingItemALLs.Where(x => x.WorkPostIds == null).ToList(); var getTestTrainingItemNulls = getTestTrainingItemALLs.Where(x => x.WorkPostIds == null).ToList();

6
SGGL/BLL/API/HSSE/APITrainingTaskService.cs
View File

@ -280,7 +280,11 @@ namespace BLL
//} //}
if (!string.IsNullOrEmpty(VideoProgress)) if (!string.IsNullOrEmpty(VideoProgress))
{ {
item.VideoProgress = int.Parse(VideoProgress); if (!item.VideoProgress.HasValue)
{
item.VideoProgress = 0;
}
item.VideoProgress = item.VideoProgress.Value + int.Parse(VideoProgress);
} }
var span = endTime.Subtract(startTime); var span = endTime.Subtract(startTime);
//item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes; //item.LearnTime = item.LearnTime.Value + (int)span.TotalMinutes;

2
SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
View File

@ -310,8 +310,6 @@ namespace WebAPI.Controllers
} }
#endregion #endregion
public Model.ResponeData getTrainingPlanTestRecordItemByTestPlanIdPersonId( string companyTrainingItemCode, string personId,string projectId) public Model.ResponeData getTrainingPlanTestRecordItemByTestPlanIdPersonId( string companyTrainingItemCode, string personId,string projectId)
{ {
var responeData = new Model.ResponeData(); var responeData = new Model.ResponeData();