This commit is contained in:
		
							parent
							
								
									6390d40901
								
							
						
					
					
						commit
						76ffea4c03
					
				| 
						 | 
					@ -120,7 +120,7 @@ namespace BLL
 | 
				
			||||||
                                    join y in db.Training_CompanyTrainingItem on x.TrainingItemCode equals y.CompanyTrainingItemCode into temp
 | 
					                                    join y in db.Training_CompanyTrainingItem on x.TrainingItemCode equals y.CompanyTrainingItemCode into temp
 | 
				
			||||||
                                    //join z in db.Training_CompanyTraining on y.CompanyTrainingId equals z.CompanyTrainingId into temp
 | 
					                                    //join z in db.Training_CompanyTraining on y.CompanyTrainingId equals z.CompanyTrainingId into temp
 | 
				
			||||||
                                    from y in temp.DefaultIfEmpty()
 | 
					                                    from y in temp.DefaultIfEmpty()
 | 
				
			||||||
                                    where t.ProjectId == projectId && t.UserId == personId 
 | 
					                                    where t.ProjectId == projectId && t.UserId == personId
 | 
				
			||||||
                                    orderby x.TrainingItemCode
 | 
					                                    orderby x.TrainingItemCode
 | 
				
			||||||
                                    select new Model.TrainingRecordItemItem
 | 
					                                    select new Model.TrainingRecordItemItem
 | 
				
			||||||
                                    {
 | 
					                                    {
 | 
				
			||||||
| 
						 | 
					@ -129,7 +129,7 @@ namespace BLL
 | 
				
			||||||
                                        PlanId = x.PlanId,
 | 
					                                        PlanId = x.PlanId,
 | 
				
			||||||
                                        StartTime = x.StartTime,
 | 
					                                        StartTime = x.StartTime,
 | 
				
			||||||
                                        EndTime = x.EndTime,
 | 
					                                        EndTime = x.EndTime,
 | 
				
			||||||
                                        LearningTime = x.LearnTime,
 | 
					                                        LearningTime = x.LearnTime ?? 0,
 | 
				
			||||||
                                        AttachTime = y.LearningTime,
 | 
					                                        AttachTime = y.LearningTime,
 | 
				
			||||||
                                        VideoProgress = x.VideoProgress,
 | 
					                                        VideoProgress = x.VideoProgress,
 | 
				
			||||||
                                        PersonId = x.PersonId,
 | 
					                                        PersonId = x.PersonId,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue