人员单位过滤
This commit is contained in:
parent
4000a4ef96
commit
1fd5831f29
|
|
@ -584,6 +584,7 @@ namespace BLL
|
|||
var beUnderConstructionTask = HSSEData_HSSEService.GetBeUnderConstructionAsync();
|
||||
var shutdownTask = HSSEData_HSSEService.GetShutdownAsync();
|
||||
var joinConstructionPersonTask = HSSEData_HSSEService.GetJoinConstructionPersonAsync();
|
||||
var joinConstructionPersonPushGroupTask = HSSEData_HSSEService.GetJoinConstructionPersonPushGroupAsync();
|
||||
var majorProjectsUnderConstructionTask = HSSEData_HSSEService.GetMajorProjectsUnderConstructionAsync();
|
||||
var totalWorkingHourTask = HSSEData_HSSEService.GetTotalWorkingHourAsync();
|
||||
var lostWorkingHourTask = HSSEData_HSSEService.GetLostWorkingHourAsync();
|
||||
|
|
@ -650,7 +651,7 @@ namespace BLL
|
|||
qualityPersonNumTask,
|
||||
beUnderConstructionTask,
|
||||
shutdownTask,
|
||||
joinConstructionPersonTask,
|
||||
joinConstructionPersonTask,joinConstructionPersonPushGroupTask,
|
||||
majorProjectsUnderConstructionTask,
|
||||
totalWorkingHourTask,
|
||||
lostWorkingHourTask,
|
||||
|
|
@ -718,6 +719,7 @@ namespace BLL
|
|||
var beUnderConstructionList = await beUnderConstructionTask;
|
||||
var shutdownList = await shutdownTask;
|
||||
var joinConstructionPersonList = await joinConstructionPersonTask;
|
||||
var joinConstructionPersonPushGroupList = await joinConstructionPersonPushGroupTask;
|
||||
var majorProjectsUnderConstructionList = await majorProjectsUnderConstructionTask;
|
||||
var totalWorkingHour = await totalWorkingHourTask;
|
||||
var lostWorkingHour = await lostWorkingHourTask;
|
||||
|
|
@ -787,7 +789,8 @@ namespace BLL
|
|||
CertificateBNum = certificateBList.Count(),
|
||||
CertificateCNum = certificateCList.Count(),
|
||||
QualityPersonNum = qualityPersonList.Count(),
|
||||
JoinConstructionPersonNum = joinConstructionPersonList.Count(),
|
||||
//JoinConstructionPersonNum = joinConstructionPersonList.Count(),
|
||||
JoinConstructionPersonNum = joinConstructionPersonPushGroupList.Select(p => new { p.IdentityCard }).Distinct().Count(),
|
||||
MajorProjectsUnderConstructionNum = majorProjectsUnderConstructionList.Count(),
|
||||
TotalWorkingHour = totalWorkingHour,
|
||||
LostWorkingHour = lostWorkingHour,
|
||||
|
|
@ -3036,6 +3039,73 @@ namespace BLL
|
|||
{
|
||||
return await Task.Run(GetJoinConstructionPerson);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取集团二级单位名称list,排除本单位【集团下面二级责任单位】
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<string> GetNonLocalUnitNames()
|
||||
{
|
||||
List<string> list = new List<string>();
|
||||
list.Add("中国天辰工程有限公司");
|
||||
list.Add("赛鼎工程有限公司");
|
||||
list.Add("东华工程科技股份有限公司");
|
||||
list.Add("中国五环工程有限公司");
|
||||
list.Add("华陆工程科技有限责任公司");
|
||||
list.Add("中国成达工程有限公司");
|
||||
list.Add("中化学土木工程有限公司");
|
||||
list.Add("中化二建集团有限公司");
|
||||
list.Add("中国化学工程第三建设有限公司");
|
||||
list.Add("中国化学工程第四建设有限公司");
|
||||
list.Add("中国化学工程第六建设有限公司");
|
||||
list.Add("中国化学工程第七建设有限公司");
|
||||
list.Add("中国化学工程第十一建设有限公司");
|
||||
list.Add("中国化学工程第十三建设有限公司");
|
||||
list.Add("中国化学工程第十四建设有限公司");
|
||||
list.Add("中国化学工程第十六建设有限公司");
|
||||
list.Add("中国化学工程重型机械化有限公司");
|
||||
list.Add("中化学交通建设集团有限公司");
|
||||
list.Add("中化学(北京)建设投资有限公司");
|
||||
list.Add("中化学南方建设投资有限公司");
|
||||
list.Add("中化学城市投资有限公司");
|
||||
list.Add("中化学生态环境有限公司");
|
||||
list.Add("中化学西南工程科技有限公司");
|
||||
list.Add("中化学装备科技集团有限公司");
|
||||
list.Add("中化学华谊工程科技集团有限公司");
|
||||
list.Add("中化学开发建设有限公司");
|
||||
|
||||
var thisUnit = CommonService.GetIsThisUnit();
|
||||
list = list.Where(x => x != thisUnit.UnitName).ToList();
|
||||
return list;
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取参建人数【推送集团】
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static List<Model.BaseEntities> GetJoinConstructionPersonPushGroup()
|
||||
{
|
||||
var NonLocalUnitNamesList = GetNonLocalUnitNames();
|
||||
var result = (from x in Funs.DB.SitePerson_Person
|
||||
join unit in Funs.DB.Base_Unit on x.UnitId equals unit.UnitId into unitJoin
|
||||
from unit in unitJoin.DefaultIfEmpty()
|
||||
where BeUnderConstructionList.Contains(x.ProjectId) && x.IsUsed == true && NonLocalUnitNamesList.Contains(unit.UnitName) == false
|
||||
select new Model.BaseEntities
|
||||
{
|
||||
Id = x.PersonId,
|
||||
IdentityCard = x.IdentityCard,
|
||||
ProjectId = x.ProjectId,
|
||||
UnitId = x.UnitId,
|
||||
}).ToList();
|
||||
return result;
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取参建人数(异步)【推送集团】
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static async Task<List<Model.BaseEntities>> GetJoinConstructionPersonPushGroupAsync()
|
||||
{
|
||||
return await Task.Run(GetJoinConstructionPersonPushGroup);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取在施危大工程数
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@
|
|||
/// 单位编码
|
||||
/// </summary>
|
||||
public string UnitCode { get; set; }
|
||||
/// <summary>
|
||||
/// 身份证号码
|
||||
/// </summary>
|
||||
public string IdentityCard { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue