1、车辆交易安全管理，现场车辆管理：补充批量退场和导入功能；
2、危大工程方案调整 3、企业安全检查调整 4、安全活动调整
This commit is contained in:
@@ -122,6 +122,12 @@ namespace BLL
|
||||
SuperConstructionNum = newtable.SuperConstructionNum,
|
||||
SuperFinishedNum = newtable.SuperFinishedNum,
|
||||
SuperArgumentNum = newtable.SuperArgumentNum,
|
||||
AwaitApprovalNum = newtable.AwaitApprovalNum,
|
||||
PendingApprovalNum = newtable.PendingApprovalNum,
|
||||
CompletedApprovalNum = newtable.CompletedApprovalNum,
|
||||
SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum,
|
||||
SuperPendingApprovalNum = newtable.SuperPendingApprovalNum,
|
||||
SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum,
|
||||
State = newtable.State,
|
||||
CreateDate = newtable.CreateDate,
|
||||
CreateMan = newtable.CreateMan
|
||||
@@ -250,6 +256,12 @@ namespace BLL
|
||||
item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum;
|
||||
item.SuperOperativesNum = dataHsse.SuperOperativesNum;
|
||||
item.SuperArgumentNum = dataHsse.SuperArgumentNum;
|
||||
item.AwaitApprovalNum = dataHsse.AwaitApprovalNum;
|
||||
item.PendingApprovalNum = dataHsse.PendingApprovalNum;
|
||||
item.CompletedApprovalNum = dataHsse.CompletedApprovalNum;
|
||||
item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum;
|
||||
item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum;
|
||||
item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum;
|
||||
item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption;
|
||||
item.TotalWorkingHour = dataHsse.TotalWorkingHour;
|
||||
item.TrainPersonNum = dataHsse.TrainPersonNum;
|
||||
@@ -375,6 +387,12 @@ namespace BLL
|
||||
item.SuperArgumentNum = dataHsse.SuperArgumentNum;
|
||||
item.SuperTrainPersonNum = dataHsse.SuperTrainPersonNum;
|
||||
item.SuperOperativesNum = dataHsse.SuperOperativesNum;
|
||||
item.AwaitApprovalNum = dataHsse.AwaitApprovalNum;
|
||||
item.PendingApprovalNum = dataHsse.PendingApprovalNum;
|
||||
item.CompletedApprovalNum = dataHsse.CompletedApprovalNum;
|
||||
item.SuperAwaitApprovalNum = dataHsse.SuperAwaitApprovalNum;
|
||||
item.SuperPendingApprovalNum = dataHsse.SuperPendingApprovalNum;
|
||||
item.SuperCompletedApprovalNum = dataHsse.SuperCompletedApprovalNum;
|
||||
item.TotalEnergyConsumption = dataHsse.TotalEnergyConsumption;
|
||||
item.TotalWorkingHour = dataHsse.TotalWorkingHour;
|
||||
item.TrainPersonNum = dataHsse.TrainPersonNum;
|
||||
@@ -551,6 +569,12 @@ namespace BLL
|
||||
SuperTrainPersonNum = projectData.Sum(x => x.SuperTrainPersonNum),
|
||||
SuperConstructionNum = projectData.Sum(x => x.SuperConstructionNum),
|
||||
SuperFinishedNum = projectData.Sum(x => x.SuperFinishedNum),
|
||||
AwaitApprovalNum = projectData.Sum(x => x.AwaitApprovalNum),
|
||||
PendingApprovalNum = projectData.Sum(x => x.PendingApprovalNum),
|
||||
CompletedApprovalNum = projectData.Sum(x => x.CompletedApprovalNum),
|
||||
SuperAwaitApprovalNum = projectData.Sum(x => x.SuperAwaitApprovalNum),
|
||||
SuperPendingApprovalNum = projectData.Sum(x => x.SuperPendingApprovalNum),
|
||||
SuperCompletedApprovalNum = projectData.Sum(x => x.SuperCompletedApprovalNum),
|
||||
CreateMan = Const.sysglyId,
|
||||
CreateDate = DateTime.Now
|
||||
};
|
||||
@@ -640,7 +664,7 @@ namespace BLL
|
||||
var licensesTask = HSSEData_HSSEService.GetLicensesAsync();
|
||||
var licensesCloseTask = HSSEData_HSSEService.GetLicensesCloseAsync();
|
||||
var generalHiddenRectificationOutputsTask = HSSEData_HSSEService.GetGeneralHiddenRectificationOutputsAsync();
|
||||
var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync();
|
||||
var largerHiddenRectificationOutputsTask = HSSEData_HSSEService.GetLargerHiddenRectificationOutputsAsync();
|
||||
var majorHiddenRectificationOutputsTask = HSSEData_HSSEService.GetMajorHiddenRectificationOutputsAsync();
|
||||
|
||||
// 等待所有异步方法执行完成
|
||||
@@ -880,7 +904,13 @@ namespace BLL
|
||||
SuperOperativesNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperOperativesNum),
|
||||
SuperConstructionNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperConstructionNum),
|
||||
SuperFinishedNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperFinishedNum),
|
||||
SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum)
|
||||
SuperArgumentNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperArgumentNum),
|
||||
AwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.AwaitApprovalNum),
|
||||
PendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.PendingApprovalNum),
|
||||
CompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.CompletedApprovalNum),
|
||||
SuperAwaitApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperAwaitApprovalNum),
|
||||
SuperPendingApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperPendingApprovalNum),
|
||||
SuperCompletedApprovalNum = largeEngineeringOutputsTask.Result.Sum(x => x.SuperCompletedApprovalNum),
|
||||
};
|
||||
|
||||
#region 添加项目统计数据
|
||||
@@ -936,7 +966,13 @@ namespace BLL
|
||||
SuperOperativesNum = g.Sum(x => x.SuperOperativesNum),
|
||||
SuperConstructionNum = g.Sum(x => x.SuperConstructionNum),
|
||||
SuperFinishedNum = g.Sum(x => x.SuperFinishedNum),
|
||||
SuperArgumentNum = g.Sum(x => x.SuperArgumentNum)
|
||||
SuperArgumentNum = g.Sum(x => x.SuperArgumentNum),
|
||||
AwaitApprovalNum = g.Sum(x => x.AwaitApprovalNum),
|
||||
PendingApprovalNum = g.Sum(x => x.PendingApprovalNum),
|
||||
CompletedApprovalNum = g.Sum(x => x.CompletedApprovalNum),
|
||||
SuperAwaitApprovalNum = g.Sum(x => x.SuperAwaitApprovalNum),
|
||||
SuperPendingApprovalNum = g.Sum(x => x.SuperPendingApprovalNum),
|
||||
SuperCompletedApprovalNum = g.Sum(x => x.SuperCompletedApprovalNum),
|
||||
}
|
||||
);
|
||||
foreach (var projectid in BeUnderConstructionList)
|
||||
@@ -1041,7 +1077,13 @@ namespace BLL
|
||||
SuperOperativesNum = largeEngineeringOutputs?.SuperOperativesNum ?? 0,
|
||||
SuperConstructionNum = largeEngineeringOutputs?.SuperConstructionNum ?? 0,
|
||||
SuperFinishedNum = largeEngineeringOutputs?.SuperFinishedNum ?? 0,
|
||||
SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0
|
||||
SuperArgumentNum = largeEngineeringOutputs?.SuperArgumentNum ?? 0,
|
||||
AwaitApprovalNum = largeEngineeringOutputs?.AwaitApprovalNum ?? 0,
|
||||
PendingApprovalNum = largeEngineeringOutputs?.PendingApprovalNum ?? 0,
|
||||
CompletedApprovalNum = largeEngineeringOutputs?.CompletedApprovalNum ?? 0,
|
||||
SuperAwaitApprovalNum = largeEngineeringOutputs?.SuperAwaitApprovalNum ?? 0,
|
||||
SuperPendingApprovalNum = largeEngineeringOutputs?.SuperPendingApprovalNum ?? 0,
|
||||
SuperCompletedApprovalNum = largeEngineeringOutputs?.SuperCompletedApprovalNum ?? 0,
|
||||
};
|
||||
Project_HSSEData_HSSEService.AddProject_HSSEData_HSSE(projectHsseData);
|
||||
}
|
||||
@@ -1167,7 +1209,13 @@ namespace BLL
|
||||
table.SuperOperativesNum = newtable.SuperOperativesNum;
|
||||
table.SuperConstructionNum = newtable.SuperConstructionNum;
|
||||
table.SuperFinishedNum = newtable.SuperFinishedNum;
|
||||
table.SuperArgumentNum = newtable.SuperArgumentNum;
|
||||
table.SuperArgumentNum = newtable.SuperArgumentNum;
|
||||
table.AwaitApprovalNum = newtable.AwaitApprovalNum;
|
||||
table.PendingApprovalNum = newtable.PendingApprovalNum;
|
||||
table.CompletedApprovalNum = newtable.CompletedApprovalNum;
|
||||
table.SuperAwaitApprovalNum = newtable.SuperAwaitApprovalNum;
|
||||
table.SuperPendingApprovalNum = newtable.SuperPendingApprovalNum;
|
||||
table.SuperCompletedApprovalNum = newtable.SuperCompletedApprovalNum;
|
||||
table.State = newtable.State;
|
||||
table.CreateMan = newtable.CreateMan;
|
||||
table.CreateDate = newtable.CreateDate;
|
||||
@@ -4136,6 +4184,12 @@ namespace BLL
|
||||
SuperConstructionNum = gg.Count(x => x.States == "2" && x.IsSuperLargerHazard == true),
|
||||
SuperFinishedNum = gg.Count(x => x.States == "3" && x.IsSuperLargerHazard == true),
|
||||
SuperArgumentNum = gg.Count(x => x.IsArgument == true && x.IsSuperLargerHazard == true),
|
||||
AwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == false),
|
||||
PendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == false),
|
||||
CompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == false),
|
||||
SuperAwaitApprovalNum = gg.Count(x => x.ApprovalState == "0" && x.IsSuperLargerHazard == true),
|
||||
SuperPendingApprovalNum = gg.Count(x => x.ApprovalState == "1" && x.IsSuperLargerHazard == true),
|
||||
SuperCompletedApprovalNum = gg.Count(x => x.ApprovalState == "2" && x.IsSuperLargerHazard == true),
|
||||
}).ToList();
|
||||
return query;
|
||||
}
|
||||
@@ -4376,6 +4430,12 @@ namespace BLL
|
||||
x.SuperConstructionNum,
|
||||
x.SuperFinishedNum,
|
||||
x.SuperArgumentNum,
|
||||
x.AwaitApprovalNum,
|
||||
x.PendingApprovalNum,
|
||||
x.CompletedApprovalNum,
|
||||
x.SuperAwaitApprovalNum,
|
||||
x.SuperPendingApprovalNum,
|
||||
x.SuperCompletedApprovalNum,
|
||||
x.State,
|
||||
x.CreateDate,
|
||||
x.CreateMan
|
||||
|
||||
Reference in New Issue
Block a user