From 53eeca8eb3a059aa5473b8538ed85598601b4286 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 3 Apr 2026 16:15:58 +0800 Subject: [PATCH] 1 --- SGGL/BLL/BaseInfo/RiskLevelService.cs | 11 ++++++++--- .../HSSE/EduTrain/CompanyTraining.aspx | 4 ++-- .../HSSE/EduTrain/CompanyTraining.aspx.cs | 17 ++++++++++++----- .../HazardFactor/HazardFactorSafety.aspx | 4 ++++ .../HazardFactor/HazardFactorSafety.aspx.cs | 12 ++++++++++++ .../HazardFactorSafety.aspx.designer.cs | 18 ++++++++++++++++++ .../HazardFactorSafetySummary.aspx | 4 ++++ .../HazardFactorSafetySummary.aspx.cs | 12 ++++++++++++ .../HazardFactorSafetySummary.aspx.designer.cs | 18 ++++++++++++++++++ 9 files changed, 90 insertions(+), 10 deletions(-) diff --git a/SGGL/BLL/BaseInfo/RiskLevelService.cs b/SGGL/BLL/BaseInfo/RiskLevelService.cs index 038f72b..8241e60 100644 --- a/SGGL/BLL/BaseInfo/RiskLevelService.cs +++ b/SGGL/BLL/BaseInfo/RiskLevelService.cs @@ -92,7 +92,7 @@ namespace BLL /// 获取风险等级下拉选择项 /// /// - public static List GetLicenseTypeList() + public static List GetRiskLevelList() { return (from x in Funs.DB.Base_RiskLevel orderby x.RiskLevel select x).ToList(); } @@ -107,18 +107,23 @@ namespace BLL { dropName.DataValueField = "RiskLevelId"; dropName.DataTextField = "RiskLevelName"; - dropName.DataSource = GetLicenseTypeList(); + dropName.DataSource = GetRiskLevelList(); dropName.DataBind(); if (isShowPlease) { Funs.FineUIPleaseSelect(dropName); } } + /// + /// 风险等级下拉框 + /// + /// + /// public static void InitRiskLevelDropDownListByRiskLevelName(FineUIPro.DropDownList dropName, bool isShowPlease) { dropName.DataValueField = "RiskLevelName"; dropName.DataTextField = "RiskLevelName"; - dropName.DataSource = GetLicenseTypeList(); + dropName.DataSource = GetRiskLevelList(); dropName.DataBind(); if (isShowPlease) { diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx index ae0f461..97cebd1 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx @@ -107,9 +107,9 @@ ToolTip='<%#Bind("CompileDate") %>'> - - + --%> diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx.cs index 9c80da9..cb58d0a 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx.cs @@ -198,14 +198,21 @@ namespace FineUIPro.Web.HSSE.EduTrain { if (this.trCompanyTraining.SelectedNode != null && !string.IsNullOrEmpty(this.trCompanyTraining.SelectedNode.NodeID)) { + //string strSql = @"SELECT item.CompanyTrainingItemId,(item.CompanyTrainingItemId+'_'+CAST(row_number() over(order by item.CompanyTrainingItemCode) AS nvarchar(10))) AS CompanyTrainingItemIdNum," + // + @" item.CompanyTrainingItemId,item.CompanyTrainingId,item.CompanyTrainingItemCode,item.CompanyTrainingItemName,--A.AttachUrl," + // + @" item.CompileMan, item.CompileDate,--dbo.GetFileName(A.AttachUrl) AS AttachUrlName, " + // + @" (CASE WHEN WorkPostNames IS NULL THEN '通用' ELSE WorkPostNames END) AS WorkPostNames " + // + @" FROM dbo.Training_CompanyTrainingItem AS item" + // //+ @" LEFT JOIN (SELECT ToKeyId ,F1 as AttachUrl" + // //+ @" FROM AttachFile CROSS APPLY (SELECT * FROM dbo.f_splitstr(AttachUrl,',')) t" + // //+ @" WHERE LEN(F1) > 0) AS A ON A.ToKeyId=item.CompanyTrainingItemId " + // + @" WHERE item.CompanyTrainingId=@CompanyTrainingId"; + string strSql = @"SELECT item.CompanyTrainingItemId,(item.CompanyTrainingItemId+'_'+CAST(row_number() over(order by item.CompanyTrainingItemCode) AS nvarchar(10))) AS CompanyTrainingItemIdNum," - + @" item.CompanyTrainingItemId,item.CompanyTrainingId,item.CompanyTrainingItemCode,item.CompanyTrainingItemName,A.AttachUrl," - + @" item.CompileMan, item.CompileDate,dbo.GetFileName(A.AttachUrl) AS AttachUrlName, " + + @" item.CompanyTrainingItemId,item.CompanyTrainingId,item.CompanyTrainingItemCode,item.CompanyTrainingItemName," + + @" item.CompileMan, item.CompileDate," + @" (CASE WHEN WorkPostNames IS NULL THEN '通用' ELSE WorkPostNames END) AS WorkPostNames " + @" FROM dbo.Training_CompanyTrainingItem AS item" - + @" LEFT JOIN (SELECT ToKeyId ,F1 as AttachUrl" - + @" FROM AttachFile CROSS APPLY (SELECT * FROM dbo.f_splitstr(AttachUrl,',')) t" - + @" WHERE LEN(F1) > 0) AS A ON A.ToKeyId=item.CompanyTrainingItemId " + @" WHERE item.CompanyTrainingId=@CompanyTrainingId"; List listStr = new List diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx index f570754..19d552e 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx @@ -40,6 +40,10 @@ + + + + diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.cs index 038bcdc..9186daa 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.cs @@ -37,6 +37,8 @@ namespace FineUIPro.Web.ReportManage.HazardFactor { BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, true); BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, true); + BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpBaseRiskLevel, true); + BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpNetRiskLevel, true); Funs.DropDownPageSize(this.ddlPageSize); this.ProjectId = this.CurrUser.LoginProjectId; if (!string.IsNullOrWhiteSpace(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId) @@ -74,6 +76,16 @@ namespace FineUIPro.Web.ReportManage.HazardFactor sb.Append("AND tba.Month = @Month "); listStr.Add(new SqlParameter("@Month", month.Length == 1 ? $"0{month}" : month)); } + if (!string.IsNullOrWhiteSpace(this.drpBaseRiskLevel.SelectedValue) && this.drpBaseRiskLevel.SelectedValue != Const._Null) + { + sb.Append("AND tba.BaseRiskLevel = @BaseRiskLevel "); + listStr.Add(new SqlParameter("@BaseRiskLevel", this.drpBaseRiskLevel.SelectedValue)); + } + if (!string.IsNullOrWhiteSpace(this.drpNetRiskLevel.SelectedValue) && this.drpNetRiskLevel.SelectedValue != Const._Null) + { + sb.Append("AND tba.NetRiskLevel = @NetRiskLevel "); + listStr.Add(new SqlParameter("@NetRiskLevel", this.drpNetRiskLevel.SelectedValue)); + } if (!string.IsNullOrWhiteSpace(this.rbState.SelectedValue)) { sb.Append("AND tba.State = @State "); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.designer.cs index 27a1c94..83cad06 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.designer.cs @@ -77,6 +77,24 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.DropDownList drpMonth; + /// + /// drpBaseRiskLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpBaseRiskLevel; + + /// + /// drpNetRiskLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpNetRiskLevel; + /// /// rbState 控件。 /// diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx index e98b185..135f057 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx @@ -43,6 +43,10 @@ + + + + <%-- diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs index ab34c44..8731f80 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs @@ -38,6 +38,8 @@ namespace FineUIPro.Web.ReportManage.HazardFactor BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, ConstValue.Group_0009, true); BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, true); + BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpBaseRiskLevel, true); + BLL.RiskLevelService.InitRiskLevelDropDownListByRiskLevelName(this.drpNetRiskLevel, true); Funs.DropDownPageSize(this.ddlPageSize); ////权限按钮方法 this.GetButtonPower(); @@ -92,6 +94,16 @@ namespace FineUIPro.Web.ReportManage.HazardFactor sb.Append("AND tba.Month = @Month "); listStr.Add(new SqlParameter("@Month", month.Length == 1 ? $"0{month}" : month)); } + if (!string.IsNullOrWhiteSpace(this.drpBaseRiskLevel.SelectedValue) && this.drpBaseRiskLevel.SelectedValue != Const._Null) + { + sb.Append("AND tba.BaseRiskLevel = @BaseRiskLevel "); + listStr.Add(new SqlParameter("@BaseRiskLevel", this.drpBaseRiskLevel.SelectedValue)); + } + if (!string.IsNullOrWhiteSpace(this.drpNetRiskLevel.SelectedValue) && this.drpNetRiskLevel.SelectedValue != Const._Null) + { + sb.Append("AND tba.NetRiskLevel = @NetRiskLevel "); + listStr.Add(new SqlParameter("@NetRiskLevel", this.drpNetRiskLevel.SelectedValue)); + } //if (!string.IsNullOrEmpty(this.rbState.SelectedValue)) //{ // sb.Append("AND tba.State = @State "); diff --git a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.designer.cs b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.designer.cs index 9701e7d..d9f1bc5 100644 --- a/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.designer.cs @@ -86,6 +86,24 @@ namespace FineUIPro.Web.ReportManage.HazardFactor /// protected global::FineUIPro.DropDownList drpProject; + /// + /// drpBaseRiskLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpBaseRiskLevel; + + /// + /// drpNetRiskLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpNetRiskLevel; + /// /// rbIllegality 控件。 ///