diff --git a/DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql b/DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql new file mode 100644 index 00000000..b465705d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-06-04-xiaj.sql @@ -0,0 +1,11 @@ + + + + + +ALTER TABLE HazardFactor_Safety +ADD AccidentType NVARCHAR(200) null; +GO +ALTER TABLE HazardFactor_OccHealth +ADD AccidentType NVARCHAR(200) null; +GO diff --git a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs index 963a29a3..9ab74520 100644 --- a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs +++ b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorOccHealthService.cs @@ -41,6 +41,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; @@ -76,6 +77,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; diff --git a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs index a6dfbb38..9aff9876 100644 --- a/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs +++ b/SGGL/BLL/ReportManage/HazardFactor/HazardFactorSafetyService.cs @@ -41,6 +41,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; @@ -76,6 +77,7 @@ namespace BLL newModel.JobStep = model.JobStep; newModel.Hazard = model.Hazard; newModel.Consequence = model.Consequence; + newModel.AccidentType = model.AccidentType; newModel.Illegality = model.Illegality; newModel.BaseRiskSeverity = model.BaseRiskSeverity; newModel.BaseRiskProbability = model.BaseRiskProbability; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx index 00548228..996225cd 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/安全危害因素数据导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx index d605bb43..34934a3c 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/职业健康危害因素数据导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx index ee3a1725..532d1ae9 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealth.aspx @@ -93,6 +93,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx index 58da84f8..4b19d0a2 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx @@ -39,7 +39,19 @@ - + <%-- + --%> + + + + + + + + + + + @@ -47,6 +59,12 @@ + + + + + + @@ -90,12 +108,12 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs index 9d829371..813e96eb 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.cs @@ -77,7 +77,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); @@ -160,7 +162,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor model.WorkPlace = this.txtWorkPlace.Text.Trim(); model.JobStep = this.txtJobStep.Text.Trim(); model.Hazard = this.txtHazard.Text.Trim(); - model.Consequence = this.txtConsequence.Text.Trim(); + //model.Consequence = this.txtConsequence.Text.Trim(); + model.Consequence = this.rblConsequence.SelectedValue; + model.AccidentType = this.txtAccidentType.Text.Trim(); model.Illegality = this.rblIllegality.SelectedValue == "1"; model.BaseRiskSeverity = int.Parse(this.txtBaseRiskSeverity.Text.Trim()); model.BaseRiskProbability = int.Parse(this.txtBaseRiskProbability.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs index 6d44ee01..985836da 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthEdit.aspx.designer.cs @@ -96,13 +96,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -113,6 +122,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -212,15 +230,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs index 0cec0cde..5965d66a 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthIn.aspx.cs @@ -78,9 +78,10 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } } - public static int Cols = 19;//列数 + public static int Cols = 20;//列数 public static List validLevelStrings = new List { "低风险", "一般风险", "较大风险", "重大风险" }; + public static List validConsequenceStrings = new List { "人员伤亡", "财产损失", "环境破坏", "公司声誉" }; #endregion @@ -269,22 +270,23 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string rData2 = row[2]?.ToString().Trim(); // 作业内容/步骤 string rData3 = row[3]?.ToString().Trim(); // 危害因素描述 string rData4 = row[4]?.ToString().Trim(); // 主要后果 - string rData5 = row[5]?.ToString().Trim(); // 违法 - string rData6 = row[6]?.ToString().Trim(); // 固有风险-严重性 - string rData7 = row[7]?.ToString().Trim(); // 固有风险-可能性 - string rData8 = row[8]?.ToString().Trim(); // 固有风险-得分 - string rData9 = row[9]?.ToString().Trim(); // 固有风险-风险级别 - string rData10 = row[10]?.ToString().Trim(); // 固有风险-可接受 - string rData11 = row[11]?.ToString().Trim(); // 残留风险-现有控制措施 - string rData12 = row[12]?.ToString().Trim(); // 残留风险-严重性 - string rData13 = row[13]?.ToString().Trim(); // 残留风险-可能性 - string rData14 = row[14]?.ToString().Trim(); // 残留风险-得分 - string rData15 = row[15]?.ToString().Trim(); // 残留风险-风险级别 - string rData16 = row[16]?.ToString().Trim(); // 残留风险-可接受 - string rData17 = row[17]?.ToString().Trim(); // 新增或变更的控制措施 - string rData18 = row[18]?.ToString().Trim(); // 责任部门 + string rData5 = row[5]?.ToString().Trim(); // 事故分类 + string rData6 = row[6]?.ToString().Trim(); // 违法 + string rData7 = row[7]?.ToString().Trim(); // 固有风险-严重性 + string rData8 = row[8]?.ToString().Trim(); // 固有风险-可能性 + string rData9 = row[9]?.ToString().Trim(); // 固有风险-得分 + string rData10 = row[10]?.ToString().Trim(); // 固有风险-风险级别 + string rData11 = row[11]?.ToString().Trim(); // 固有风险-可接受 + string rData12 = row[12]?.ToString().Trim(); // 残留风险-现有控制措施 + string rData13 = row[13]?.ToString().Trim(); // 残留风险-严重性 + string rData14 = row[14]?.ToString().Trim(); // 残留风险-可能性 + string rData15 = row[15]?.ToString().Trim(); // 残留风险-得分 + string rData16 = row[16]?.ToString().Trim(); // 残留风险-风险级别 + string rData17 = row[17]?.ToString().Trim(); // 残留风险-可接受 + string rData18 = row[18]?.ToString().Trim(); // 新增或变更的控制措施 + string rData19 = row[19]?.ToString().Trim(); // 责任部门 - rData17 = rData17 == "无" ? string.Empty : rData17; + rData18 = rData18 == "无" ? string.Empty : rData18; string Year = string.Empty; string Month = string.Empty; @@ -292,6 +294,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string JobStep = string.Empty; string Hazard = string.Empty; string Consequence = string.Empty; + string AccidentType = string.Empty; bool Illegality = false; int BaseRiskSeverity = 0; int BaseRiskProbability = 0; @@ -351,16 +354,32 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } if (!string.IsNullOrEmpty(rData4)) { - Consequence = rData4; + //Consequence = rData4; + if (!validConsequenceStrings.Any(x => x == rData4)) + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "只能是[人员伤亡/财产损失/环境破坏/公司声誉]！" }); + } + else + { + Consequence = rData4; + } } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "不能为空" }); } - Illegality = !string.IsNullOrEmpty(rData5) && rData5 == "是"; - if (!string.IsNullOrEmpty(rData6)) + if (!string.IsNullOrEmpty(rData5)) { - if (!int.TryParse(rData6, out int ct)) + AccidentType = rData5; + } + else + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "事故分类", Reason = "不能为空" }); + } + Illegality = !string.IsNullOrEmpty(rData6) && rData6 == "是"; + if (!string.IsNullOrEmpty(rData7)) + { + if (!int.TryParse(rData7, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险严重性", Reason = "格式错误" }); } @@ -369,9 +388,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor BaseRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData7)) + if (!string.IsNullOrEmpty(rData8)) { - if (!int.TryParse(rData7, out int ct)) + if (!int.TryParse(rData8, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险可能性", Reason = "格式错误" }); } @@ -386,19 +405,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { BaseRiskLevel = baseRiskLevel.RiskLevelName; } - BaseRiskAcceptabity = !string.IsNullOrEmpty(rData10) && rData10 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData11)) + BaseRiskAcceptabity = !string.IsNullOrEmpty(rData11) && rData11 == "否" ? false : true; + if (!string.IsNullOrEmpty(rData12)) { - NetRiskControlMeasures = rData11; + NetRiskControlMeasures = rData12; } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "现有控制措施", Reason = "不能为空" }); } - if (!string.IsNullOrEmpty(rData12)) + if (!string.IsNullOrEmpty(rData13)) { - if (!int.TryParse(rData12, out int ct)) + if (!int.TryParse(rData13, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险严重性", Reason = "格式错误" }); } @@ -407,9 +426,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor NetRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData13)) + if (!string.IsNullOrEmpty(rData14)) { - if (!int.TryParse(rData13, out int ct)) + if (!int.TryParse(rData14, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险可能性", Reason = "格式错误" }); } @@ -424,15 +443,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { NetRiskLevel = netRiskLevel.RiskLevelName; } - NetRiskAcceptabity = !string.IsNullOrEmpty(rData16) && rData16 == "否" ? false : true; + NetRiskAcceptabity = !string.IsNullOrEmpty(rData17) && rData17 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData17)) - { - AdditionalControlMeasures = rData17; - } if (!string.IsNullOrEmpty(rData18)) { - ResponsibleDepartment = rData18; + AdditionalControlMeasures = rData18; + } + if (!string.IsNullOrEmpty(rData19)) + { + ResponsibleDepartment = rData19; } if (lstError.Any()) @@ -469,6 +488,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor JobStep = JobStep, Hazard = Hazard, Consequence = Consequence, + AccidentType = AccidentType, Illegality = Illegality, BaseRiskSeverity = BaseRiskSeverity, BaseRiskProbability = BaseRiskProbability, diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx index 4bdbb07d..89a34607 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx @@ -105,6 +105,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs index 907bc250..53560795 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthSummary.aspx.cs @@ -65,11 +65,11 @@ namespace FineUIPro.Web.ReportManage.HazardFactor sb.Append("WITH CTE AS ( "); if (dedupe == "0") {//按月 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } else {//按年 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } } else diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx index d04eac46..5c845ad8 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx @@ -45,14 +45,32 @@ - + <%-- + --%> + + + + + + + + + + + - + + + + + + + @@ -96,12 +114,6 @@ - - - - - - diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs index a108f514..bec0ce47 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.cs @@ -63,7 +63,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs index 26ed9970..4c97647a 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorOccHealthView.aspx.designer.cs @@ -105,13 +105,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -122,6 +131,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -221,15 +239,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx index 19d552eb..2f4446a6 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx @@ -93,6 +93,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx index 79f9313e..3a3274c3 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx @@ -39,7 +39,19 @@ - + <%-- + --%> + + + + + + + + + + + @@ -47,6 +59,12 @@ + + + + + + @@ -90,12 +108,12 @@ - + <%-- - + --%> diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs index 4804f9dc..9011ff0d 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.cs @@ -76,7 +76,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); @@ -159,7 +161,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor model.WorkPlace = this.txtWorkPlace.Text.Trim(); model.JobStep = this.txtJobStep.Text.Trim(); model.Hazard = this.txtHazard.Text.Trim(); - model.Consequence = this.txtConsequence.Text.Trim(); + //model.Consequence = this.txtConsequence.Text.Trim(); + model.Consequence = this.rblConsequence.SelectedValue; + model.AccidentType = this.txtAccidentType.Text.Trim(); model.Illegality = this.rblIllegality.SelectedValue == "1"; model.BaseRiskSeverity = int.Parse(this.txtBaseRiskSeverity.Text.Trim()); model.BaseRiskProbability = int.Parse(this.txtBaseRiskProbability.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs index 45ffe01b..ca400157 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyEdit.aspx.designer.cs @@ -96,13 +96,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -113,6 +122,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -212,15 +230,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs index 23a598dc..9a3726f2 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyIn.aspx.cs @@ -78,9 +78,10 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } } - public static int Cols = 19;//列数 + public static int Cols = 20;//列数 public static List validLevelStrings = new List { "低风险", "一般风险", "较大风险", "重大风险" }; + public static List validConsequenceStrings = new List { "人员伤亡", "财产损失", "环境破坏", "公司声誉" }; #endregion @@ -269,22 +270,23 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string rData2 = row[2]?.ToString().Trim(); // 作业内容/步骤 string rData3 = row[3]?.ToString().Trim(); // 危害因素描述 string rData4 = row[4]?.ToString().Trim(); // 主要后果 - string rData5 = row[5]?.ToString().Trim(); // 违法 - string rData6 = row[6]?.ToString().Trim(); // 固有风险-严重性 - string rData7 = row[7]?.ToString().Trim(); // 固有风险-可能性 - string rData8 = row[8]?.ToString().Trim(); // 固有风险-得分 - string rData9 = row[9]?.ToString().Trim(); // 固有风险-风险级别 - string rData10 = row[10]?.ToString().Trim(); // 固有风险-可接受 - string rData11 = row[11]?.ToString().Trim(); // 残留风险-现有控制措施 - string rData12 = row[12]?.ToString().Trim(); // 残留风险-严重性 - string rData13 = row[13]?.ToString().Trim(); // 残留风险-可能性 - string rData14 = row[14]?.ToString().Trim(); // 残留风险-得分 - string rData15 = row[15]?.ToString().Trim(); // 残留风险-风险级别 - string rData16 = row[16]?.ToString().Trim(); // 残留风险-可接受 - string rData17 = row[17]?.ToString().Trim(); // 新增或变更的控制措施 - string rData18 = row[18]?.ToString().Trim(); // 责任部门 + string rData5 = row[5]?.ToString().Trim(); // 事故分类 + string rData6 = row[6]?.ToString().Trim(); // 违法 + string rData7 = row[7]?.ToString().Trim(); // 固有风险-严重性 + string rData8 = row[8]?.ToString().Trim(); // 固有风险-可能性 + string rData9 = row[9]?.ToString().Trim(); // 固有风险-得分 + string rData10 = row[10]?.ToString().Trim(); // 固有风险-风险级别 + string rData11 = row[11]?.ToString().Trim(); // 固有风险-可接受 + string rData12 = row[12]?.ToString().Trim(); // 残留风险-现有控制措施 + string rData13 = row[13]?.ToString().Trim(); // 残留风险-严重性 + string rData14 = row[14]?.ToString().Trim(); // 残留风险-可能性 + string rData15 = row[15]?.ToString().Trim(); // 残留风险-得分 + string rData16 = row[16]?.ToString().Trim(); // 残留风险-风险级别 + string rData17 = row[17]?.ToString().Trim(); // 残留风险-可接受 + string rData18 = row[18]?.ToString().Trim(); // 新增或变更的控制措施 + string rData19 = row[19]?.ToString().Trim(); // 责任部门 - rData17 = rData17 == "无" ? string.Empty : rData17; + rData18 = rData18 == "无" ? string.Empty : rData18; string Year = string.Empty; string Month = string.Empty; @@ -292,6 +294,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor string JobStep = string.Empty; string Hazard = string.Empty; string Consequence = string.Empty; + string AccidentType = string.Empty; bool Illegality = false; int BaseRiskSeverity = 0; int BaseRiskProbability = 0; @@ -351,16 +354,32 @@ namespace FineUIPro.Web.ReportManage.HazardFactor } if (!string.IsNullOrEmpty(rData4)) { - Consequence = rData4; + //Consequence = rData4; + if (!validConsequenceStrings.Any(x => x == rData4)) + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "只能是[人员伤亡/财产损失/环境破坏/公司声誉]！" }); + } + else + { + Consequence = rData4; + } } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "主要后果", Reason = "不能为空" }); } - Illegality = !string.IsNullOrEmpty(rData5) && rData5 == "是"; - if (!string.IsNullOrEmpty(rData6)) + if (!string.IsNullOrEmpty(rData5)) { - if (!int.TryParse(rData6, out int ct)) + AccidentType = rData5; + } + else + { + lstError.Add(new ErrorInfo { Row = displayRow, Column = "事故分类", Reason = "不能为空" }); + } + Illegality = !string.IsNullOrEmpty(rData6) && rData6 == "是"; + if (!string.IsNullOrEmpty(rData7)) + { + if (!int.TryParse(rData7, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险严重性", Reason = "格式错误" }); } @@ -369,9 +388,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor BaseRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData7)) + if (!string.IsNullOrEmpty(rData8)) { - if (!int.TryParse(rData7, out int ct)) + if (!int.TryParse(rData8, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "固有风险可能性", Reason = "格式错误" }); } @@ -386,19 +405,19 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { BaseRiskLevel = baseRiskLevel.RiskLevelName; } - BaseRiskAcceptabity = !string.IsNullOrEmpty(rData10) && rData10 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData11)) + BaseRiskAcceptabity = !string.IsNullOrEmpty(rData11) && rData11 == "否" ? false : true; + if (!string.IsNullOrEmpty(rData12)) { - NetRiskControlMeasures = rData11; + NetRiskControlMeasures = rData12; } else { lstError.Add(new ErrorInfo { Row = displayRow, Column = "现有控制措施", Reason = "不能为空" }); } - if (!string.IsNullOrEmpty(rData12)) + if (!string.IsNullOrEmpty(rData13)) { - if (!int.TryParse(rData12, out int ct)) + if (!int.TryParse(rData13, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险严重性", Reason = "格式错误" }); } @@ -407,9 +426,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor NetRiskSeverity = ct; } } - if (!string.IsNullOrEmpty(rData13)) + if (!string.IsNullOrEmpty(rData14)) { - if (!int.TryParse(rData13, out int ct)) + if (!int.TryParse(rData14, out int ct)) { lstError.Add(new ErrorInfo { Row = displayRow, Column = "残留风险可能性", Reason = "格式错误" }); } @@ -424,15 +443,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { NetRiskLevel = netRiskLevel.RiskLevelName; } - NetRiskAcceptabity = !string.IsNullOrEmpty(rData16) && rData16 == "否" ? false : true; + NetRiskAcceptabity = !string.IsNullOrEmpty(rData17) && rData17 == "否" ? false : true; - if (!string.IsNullOrEmpty(rData17)) - { - AdditionalControlMeasures = rData17; - } if (!string.IsNullOrEmpty(rData18)) { - ResponsibleDepartment = rData18; + AdditionalControlMeasures = rData18; + } + if (!string.IsNullOrEmpty(rData19)) + { + ResponsibleDepartment = rData19; } if (lstError.Any()) @@ -469,6 +488,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor JobStep = JobStep, Hazard = Hazard, Consequence = Consequence, + AccidentType = AccidentType, Illegality = Illegality, BaseRiskSeverity = BaseRiskSeverity, BaseRiskProbability = BaseRiskProbability, diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx index 27b4f181..e3067307 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx @@ -105,6 +105,8 @@ + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs index 324165e3..b6b1c0f1 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs @@ -65,11 +65,11 @@ namespace FineUIPro.Web.ReportManage.HazardFactor sb.Append("WITH CTE AS ( "); if (dedupe == "0") {//按月 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.Month,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } else {//按年 - sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); + sb.Append("SELECT ROW_NUMBER() OVER (PARTITION BY tba.Year,tba.WorkPlace,tba.JobStep,tba.Hazard,tba.Consequence,tba.AccidentType,tba.Illegality,tba.BaseRiskSeverity,tba.BaseRiskProbability,tba.BaseRiskScore,tba.BaseRiskLevel,tba.BaseRiskAcceptabity,tba.NetRiskControlMeasures,tba.NetRiskSeverity,tba.NetRiskProbability,tba.NetRiskScore,tba.NetRiskLevel,tba.NetRiskAcceptabity,tba.AdditionalControlMeasures ORDER BY CompileDate desc) as rn,tba.* "); } } else diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx index 295b3915..feccd925 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx @@ -45,7 +45,19 @@ - + <%-- + --%> + + + + + + + + + + + @@ -53,6 +65,12 @@ + + + + + + @@ -96,12 +114,6 @@ - - - - - - diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs index b94b5b92..17631420 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.cs @@ -62,7 +62,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor this.txtWorkPlace.Text = model.WorkPlace; this.txtJobStep.Text = model.JobStep; this.txtHazard.Text = model.Hazard; - this.txtConsequence.Text = model.Consequence; + //this.txtConsequence.Text = model.Consequence; + this.rblConsequence.SelectedValue = model.Consequence; + this.txtAccidentType.Text = model.AccidentType; this.rblIllegality.SelectedValue = model.Illegality ? "1" : "0"; this.txtBaseRiskSeverity.Text = model.BaseRiskSeverity.ToString(); this.txtBaseRiskProbability.Text = model.BaseRiskProbability.ToString(); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs index 0fd50b76..08bac186 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetyView.aspx.designer.cs @@ -105,13 +105,22 @@ namespace FineUIPro.Web.ReportManage.HazardFactor protected global::FineUIPro.TextArea txtHazard; /// - /// txtConsequence 控件。 + /// rblConsequence 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtConsequence; + protected global::FineUIPro.RadioButtonList rblConsequence; + + /// + /// txtAccidentType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccidentType; /// /// rblIllegality 控件。 @@ -122,6 +131,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.RadioButtonList rblIllegality; + /// + /// txtNetRiskControlMeasures 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtNetRiskControlMeasures; + /// /// Panel1 控件。 /// @@ -221,15 +239,6 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.Form Form4; - /// - /// txtNetRiskControlMeasures 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtNetRiskControlMeasures; - /// /// txtNetRiskSeverity 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 5498255e..264852e5 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -88199,7 +88199,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")] public string UnitName { get @@ -88239,7 +88239,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")] public string ProjectName { get @@ -171049,6 +171049,8 @@ namespace Model private string _UnitProjectName; + private string _AccidentType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -171109,6 +171111,8 @@ namespace Model partial void OnUnitIdChanged(); partial void OnUnitProjectNameChanging(string value); partial void OnUnitProjectNameChanged(); + partial void OnAccidentTypeChanging(string value); + partial void OnAccidentTypeChanged(); #endregion public HazardFactor_OccHealth() @@ -171676,6 +171680,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccidentType", DbType="NVarChar(200)")] + public string AccidentType + { + get + { + return this._AccidentType; + } + set + { + if ((this._AccidentType != value)) + { + this.OnAccidentTypeChanging(value); + this.SendPropertyChanging(); + this._AccidentType = value; + this.SendPropertyChanged("AccidentType"); + this.OnAccidentTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -171759,6 +171783,8 @@ namespace Model private string _UnitProjectName; + private string _AccidentType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -171819,6 +171845,8 @@ namespace Model partial void OnUnitIdChanged(); partial void OnUnitProjectNameChanging(string value); partial void OnUnitProjectNameChanged(); + partial void OnAccidentTypeChanging(string value); + partial void OnAccidentTypeChanged(); #endregion public HazardFactor_Safety() @@ -172386,6 +172414,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccidentType", DbType="NVarChar(200)")] + public string AccidentType + { + get + { + return this._AccidentType; + } + set + { + if ((this._AccidentType != value)) + { + this.OnAccidentTypeChanging(value); + this.SendPropertyChanging(); + this._AccidentType = value; + this.SendPropertyChanged("AccidentType"); + this.OnAccidentTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged;