lpf
/
xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
夏菊 2026-04-03 16:15:58 +08:00
parent 50f4c898ee
commit 53eeca8eb3
9 changed files with 90 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SGGL/BLL/BaseInfo/RiskLevelService.cs
View File

@ -92,7 +92,7 @@ namespace BLL
/// 获取风险等级下拉选择项
/// </summary>
/// <returns></returns>
public static List<Model.Base_RiskLevel> GetLicenseTypeList()
public static List<Model.Base_RiskLevel> 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);
}
}
/// <summary>
/// 风险等级下拉框
/// </summary>
/// <param name="dropName"></param>
/// <param name="isShowPlease"></param>
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)
{

4
SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx
View File

@ -107,9 +107,9 @@
ToolTip='<%#Bind("CompileDate") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:LinkButtonField ColumnID="AttachUrlName" DataTextField="AttachUrlName" DataToolTipField="AttachUrlName" HeaderText="附件"
<%--<f:LinkButtonField ColumnID="AttachUrlName" DataTextField="AttachUrlName" DataToolTipField="AttachUrlName" HeaderText="附件"
CommandName="Attach" EnableAjax="false" HeaderTextAlign="Center" Width="120px">
</f:LinkButtonField>
</f:LinkButtonField>--%>
<f:BoundField runat="server" Hidden="true" ColumnID="hdUrl" DataField="AttachUrl"></f:BoundField>
</Columns>
<Listeners>

17
SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx.cs
View File

@ -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<SqlParameter> listStr = new List<SqlParameter>

4
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx
View File

@ -40,6 +40,10 @@
<f:DropDownList ID="drpMonth" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="160px" LabelWidth="50px" Label="月份" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpBaseRiskLevel" runat="server" Label="固有风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpNetRiskLevel" runat="server" Label="残留风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:RadioButtonList runat="server" ID="rbState" Label="状态" Width="260px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="全部" Value="" Selected="true" />
<f:RadioItem Text="未提交" Value="0" />

12
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.cs
View File

@ -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 ");

18
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafety.aspx.designer.cs generated
View File

@ -77,6 +77,24 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
/// </remarks>
protected global::FineUIPro.DropDownList drpMonth;
/// <summary>
/// drpBaseRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpBaseRiskLevel;
/// <summary>
/// drpNetRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNetRiskLevel;
/// <summary>
/// rbState 控件。
/// </summary>

4
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx
View File

@ -43,6 +43,10 @@
<f:DropDownList ID="drpProject" EnableEdit="true" ForceSelection="false" AutoPostBack="true" EnableSimulateTree="true" runat="server"
Width="220px" LabelWidth="50px" Label="项目" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpBaseRiskLevel" runat="server" Label="固有风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<f:DropDownList ID="drpNetRiskLevel" runat="server" Label="残留风险" Width="180px" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
</f:DropDownList>
<%--<f:RadioButtonList runat="server" ID="rbState" Label="状态" Width="260px" LabelWidth="50px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:RadioItem Text="全部" Value="" Selected="true" />
<f:RadioItem Text="未提交" Value="0" />

12
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.cs
View File

@ -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 ");

18
SGGL/FineUIPro.Web/ReportManage/HazardFactor/HazardFactorSafetySummary.aspx.designer.cs generated
View File

@ -86,6 +86,24 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// drpBaseRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpBaseRiskLevel;
/// <summary>
/// drpNetRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNetRiskLevel;
/// <summary>
/// rbIllegality 控件。
/// </summary>