diff --git a/DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql new file mode 100644 index 00000000..07061f7f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-02-18-001-gaofei.sql @@ -0,0 +1,3 @@ +alter table HSSE_ConstructionRisk add IsLarge bit null +alter table HSSE_ConstructionRisk add IsSuperLarge bit null +GO \ No newline at end of file diff --git a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs index 307cfa36..1deb450a 100644 --- a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs +++ b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class ConstructionRiskListService { - + /// /// 要求主键获取危险清单信息 @@ -48,6 +48,8 @@ namespace BLL UnitId = constructionRisk.UnitId, RiskLevel = constructionRisk.RiskLevel, Coordinate = constructionRisk.Coordinate, + IsLarge = constructionRisk.IsLarge, + IsSuperLarge = constructionRisk.IsSuperLarge, SubUnitDutyPerson = constructionRisk.SubUnitDutyPerson, MainUnitDutyPerson = constructionRisk.MainUnitDutyPerson, MainUnitCheckPerson = constructionRisk.MainUnitCheckPerson, @@ -142,6 +144,8 @@ namespace BLL newHazardList.UnitId = hazardList.UnitId; newHazardList.RiskLevel = hazardList.RiskLevel; newHazardList.Coordinate = hazardList.Coordinate; + newHazardList.IsLarge = hazardList.IsLarge; + newHazardList.IsSuperLarge = hazardList.IsSuperLarge; newHazardList.SubUnitDutyPerson = hazardList.SubUnitDutyPerson; newHazardList.MainUnitDutyPerson = hazardList.MainUnitDutyPerson; newHazardList.MainUnitCheckPerson = hazardList.MainUnitCheckPerson; @@ -175,7 +179,27 @@ namespace BLL } /// - /// 获取作业风险描述下拉项 + /// 获取涉及的高风险作业下拉项 + /// + /// + public static ListItem[] RefLicenseList() + { + ListItem[] lis = new ListItem[10]; + lis[0] = new ListItem("不涉及", "不涉及"); + lis[1] = new ListItem("动火作业", "动火作业"); + lis[2] = new ListItem("高处作业", "高处作业"); + lis[3] = new ListItem("受限空间作业", "受限空间作业"); + lis[4] = new ListItem("射线作业", "射线作业"); + lis[5] = new ListItem("断路(占道)作业", "断路(占道)作业"); + lis[6] = new ListItem("夜间施工作业", "夜间施工作业"); + lis[7] = new ListItem("吊装作业", "吊装作业"); + lis[8] = new ListItem("动土作业", "动土作业"); + lis[9] = new ListItem("试压作业", "试压作业"); + return lis; + } + + /// + /// 获取作业风险下拉项 /// /// public static ListItem[] LicenseDesList() @@ -230,6 +254,17 @@ namespace BLL return lis; } + /// + /// 获取风险等级下拉项 + /// + /// + public static ListItem[] RiskLevelList3() + { + ListItem[] lis = new ListItem[1]; + lis[0] = new ListItem("重大风险", "重大风险"); + return lis; + } + /// /// 根据状态选择下一步办理类型 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls index b1ab96ec..74ac93cd 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx index 7a409f7c..ffccce62 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx @@ -88,7 +88,7 @@ HeaderTextAlign="Center">