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