This commit is contained in:
高飞 2026-01-07 11:44:30 +08:00
parent d123dc5c9f
commit 0dcd80d005
2 changed files with 75 additions and 1 deletions

View File

@ -678,6 +678,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();
@ -745,6 +746,7 @@ namespace BLL
beUnderConstructionTask,
shutdownTask,
joinConstructionPersonTask,
joinConstructionPersonPushGroupTask,
majorProjectsUnderConstructionTask,
totalWorkingHourTask,
lostWorkingHourTask,
@ -812,6 +814,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;
@ -881,7 +884,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,
@ -3162,6 +3166,72 @@ 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("中化学开发建设有限公司");
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.States == "1" && 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>
/// 获取在施危大工程数

View File

@ -34,6 +34,10 @@
/// 单位编码
/// </summary>
public string UnitCode { get; set; }
/// <summary>
/// 身份证号码
/// </summary>
public string IdentityCard { get; set; }
}
}