zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交集团数据穿透修改

Browse Source
This commit is contained in:
高飞
2023-06-19 09:04:34 +08:00
parent efed3c7f6f
commit 1e709abb1a
184 changed files with 10777 additions and 3631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Hazard/HazardListView.aspx.cs
+13 -1
View File
@@ -219,6 +219,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 +233,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 +291,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 +308,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]);//把工作阶段放入集合里