增加数据穿透界面
This commit is contained in:
@@ -148,9 +148,6 @@ namespace FineUIPro.Web.HSSE.Hazard
|
||||
this.SelectedCheckedHazardItem();
|
||||
}
|
||||
}
|
||||
///初始化审核菜单
|
||||
this.ctlAuditFlow.MenuId = BLL.Const.ProjectHazardListMenuId;
|
||||
this.ctlAuditFlow.DataId = this.HazardListId;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -219,6 +216,8 @@ namespace FineUIPro.Web.HSSE.Hazard
|
||||
List<Model.Hazard_HazardSelectedItem> hazardSelectedItems = Hazard_HazardSelectedItemService.GetHazardSelectedItemsByHazardListId(HazardListId);
|
||||
foreach (Model.Hazard_HazardSelectedItem hazardSelectedItem in hazardSelectedItems)
|
||||
{
|
||||
Model.Base_RiskLevel riskLevel = BLL.RiskLevelService.GetRiskLevel(hazardSelectedItem.HazardLevel);
|
||||
|
||||
Model.HSSE_HazardTemplate newHazardTemplate = new Model.HSSE_HazardTemplate
|
||||
{
|
||||
HazardId = hazardSelectedItem.HazardId,
|
||||
@@ -231,10 +230,14 @@ namespace FineUIPro.Web.HSSE.Hazard
|
||||
HazardJudge_E = hazardSelectedItem.HazardJudge_E,
|
||||
HazardJudge_C = hazardSelectedItem.HazardJudge_C,
|
||||
HazardJudge_D = hazardSelectedItem.HazardJudge_D,
|
||||
HazardLevel = hazardSelectedItem.HazardLevel,
|
||||
|
||||
ControlMeasures = hazardSelectedItem.ControlMeasures,
|
||||
WorkStage = hazardSelectedItem.WorkStage.Trim()
|
||||
};
|
||||
if (riskLevel != null)
|
||||
{
|
||||
newHazardTemplate.HazardLevel = riskLevel.RiskLevelName;
|
||||
}
|
||||
newHazardTemplates.Add(newHazardTemplate);
|
||||
}
|
||||
hazardTemplates = newHazardTemplates;
|
||||
@@ -285,6 +288,7 @@ namespace FineUIPro.Web.HSSE.Hazard
|
||||
foreach (var item in templates)
|
||||
{
|
||||
Model.Technique_HazardList template = BLL.HazardListService.GetHazardListById(item.Split(',').ToList()[0]);
|
||||
Model.Base_RiskLevel riskLevel = BLL.RiskLevelService.GetRiskLevel(template.HazardLevel);
|
||||
Model.HSSE_HazardTemplate hazardTemplate = new Model.HSSE_HazardTemplate
|
||||
{
|
||||
HazardId = template.HazardId,
|
||||
@@ -301,6 +305,11 @@ namespace FineUIPro.Web.HSSE.Hazard
|
||||
HazardLevel = template.HazardLevel,
|
||||
ControlMeasures = template.ControlMeasures
|
||||
};
|
||||
|
||||
if (riskLevel != null)
|
||||
{
|
||||
hazardTemplate.HazardLevel = riskLevel.RiskLevelName;
|
||||
}
|
||||
hazardTemplates.Add(hazardTemplate);
|
||||
workStageIds.Add(item.Split(',').ToList()[1]);//把工作阶段放入集合里
|
||||
|
||||
|
||||
Reference in New Issue
Block a user