This commit is contained in:
parent
cf0eafe227
commit
202c997f14
|
|
@ -1160,7 +1160,7 @@ namespace BLL
|
|||
/// <returns></returns>
|
||||
public static List<Model.EduTrainOutput> GetTechnicalDisclosePerson()
|
||||
{
|
||||
var result = (from x in Funs.DB.Comprehensive_DesignDetails
|
||||
var result = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
|
||||
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
|
||||
from p in pGroup.DefaultIfEmpty()
|
||||
where BeUnderConstructionList.Contains(p.ProjectId) && x.CompileDate > Const.DtmarkTime
|
||||
|
|
@ -1169,11 +1169,11 @@ namespace BLL
|
|||
ProjectId = x.ProjectId,
|
||||
ProjectName = p.ProjectName,
|
||||
UnitName = "",
|
||||
Id = x.DesignDetailsId,
|
||||
Id = x.ConTechnologyDisclosureId,
|
||||
TrainTitle = "",
|
||||
TrainStartDate = null,
|
||||
TrainEndDate = null,
|
||||
TrainPersonNum = x.JoinPersonNum ?? 0,
|
||||
TrainPersonNum = x.DisclosurePersonNum ?? 0,
|
||||
}).ToList();
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue