危害因素调整
This commit is contained in:
@@ -273,7 +273,8 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
/// <param name="e"></param>
|
||||
protected void btnImport_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorOccHealthIn.aspx?ProjectId={0}", this.ProjectId, "导入 - ")));
|
||||
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorOccHealthIn.aspx?ProjectId={0}", this.ProjectId, "导入 - ")));
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorOccHealthIn.aspx?ProjectId={0}&UnitId={1}", this.CurrUser.LoginProjectId, this.CurrUser.UnitId, "导入 - ")));
|
||||
}
|
||||
|
||||
#region 导出按钮
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using BLL;
|
||||
using FineUIPro.Web.DataShow;
|
||||
using Model;
|
||||
using System;
|
||||
using System.Linq;
|
||||
@@ -144,7 +145,18 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
var yearMonth2 = this.drpYearMonth.SelectedDate;
|
||||
model.Year = yearMonth.Split('-')[0];
|
||||
model.Month = yearMonth.Split('-')[1];
|
||||
model.ProjectId = this.ProjectId;
|
||||
if (!string.IsNullOrWhiteSpace(this.ProjectId))
|
||||
{
|
||||
var project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
|
||||
model.ProjectId = this.ProjectId;
|
||||
model.UnitProjectName = project.ProjectName;
|
||||
}
|
||||
else
|
||||
{
|
||||
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
|
||||
model.UnitId = unit.UnitId;
|
||||
model.UnitProjectName = unit.UnitName;
|
||||
}
|
||||
model.WorkPlace = this.txtWorkPlace.Text.Trim();
|
||||
model.JobStep = this.txtJobStep.Text.Trim();
|
||||
model.Hazard = this.txtHazard.Text.Trim();
|
||||
|
||||
@@ -39,6 +39,20 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 单位id
|
||||
/// </summary>
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["UnitId"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["UnitId"] = value;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 操作人
|
||||
/// </summary>
|
||||
public string CompileMan
|
||||
@@ -75,6 +89,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.ProjectId = Request.Params["ProjectId"];
|
||||
this.UnitId = Request.Params["UnitId"];
|
||||
|
||||
|
||||
this.CompileMan = this.CurrUser.UserId;
|
||||
@@ -303,7 +318,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
else
|
||||
{
|
||||
Year = ct.Year.ToString();
|
||||
Month = ct.Month.ToString();
|
||||
Month = ct.Month > 9 ? ct.Month.ToString() : $"0{ct.Month}";
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -425,6 +440,18 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
return (lstError, null);
|
||||
}
|
||||
|
||||
string UnitProjectName = string.Empty;
|
||||
if (!string.IsNullOrWhiteSpace(this.ProjectId))
|
||||
{
|
||||
var project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
|
||||
UnitProjectName = project.ProjectName;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(this.UnitId))
|
||||
{
|
||||
var unit = BLL.UnitService.GetUnitByUnitId(this.UnitId);
|
||||
UnitProjectName = unit.UnitName;
|
||||
}
|
||||
|
||||
// 其余字段可根据实际业务映射到实体
|
||||
var entity = new Model.HazardFactor_OccHealth
|
||||
{
|
||||
@@ -433,7 +460,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
CompileMan = this.CompileMan,
|
||||
CompileManName = this.CompileManName,
|
||||
State = int.Parse(BLL.Const.State_1),//默认已提交
|
||||
ProjectId =this.ProjectId,
|
||||
ProjectId = this.ProjectId,
|
||||
UnitId = this.UnitId,
|
||||
UnitProjectName = UnitProjectName,
|
||||
Year = Year,
|
||||
Month = Month,
|
||||
WorkPlace = WorkPlace,
|
||||
|
||||
@@ -64,7 +64,10 @@
|
||||
</f:RadioButtonList>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
|
||||
<%--<f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="false" runat="server" Hidden="true">
|
||||
</f:Button>--%>
|
||||
<f:Button ID="btnImport" ToolTip="导入" Text="导入" Icon="ApplicationGet" runat="server" OnClick="btnImport_Click" Hidden="true">
|
||||
</f:Button>
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
|
||||
EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
</f:Button>
|
||||
@@ -90,7 +93,9 @@
|
||||
<asp:Label ID="lbState" runat="server" Text='<%# ConvertDataState(Eval("State")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="180px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
|
||||
<%--<f:RenderField Width="180px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
|
||||
</f:RenderField>--%>
|
||||
<f:RenderField Width="180px" ColumnID="UnitProjectName" DataField="UnitProjectName" FieldType="String" HeaderText="单位项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="180px" ColumnID="WorkPlace" DataField="WorkPlace" SortField="WorkPlace" FieldType="String" HeaderText="活动区域/场所/设备" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
|
||||
</f:RenderField>
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
////权限按钮方法
|
||||
this.GetButtonPower();
|
||||
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||
//btnNew.OnClientClick = Window1.GetShowReference("HazardFactorSafetyEdit.aspx") + "return false;";
|
||||
// 绑定表格
|
||||
BindGrid();
|
||||
}
|
||||
@@ -64,20 +65,26 @@ 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,tbb.ProjectName,tba.* ");
|
||||
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.* ");
|
||||
}
|
||||
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,tbb.ProjectName,tba.* ");
|
||||
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.* ");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sb.Append("SELECT tbb.ProjectName,tba.* ");
|
||||
sb.Append("SELECT tba.* ");
|
||||
}
|
||||
sb.Append("FROM HazardFactor_OccHealth AS tba WITH(NOLOCK) ");
|
||||
sb.Append("LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId ");
|
||||
//sb.Append("LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId ");
|
||||
sb.Append("WHERE 1=1 AND tba.State = 1 ");//取已提交数据
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ)
|
||||
{//分公司只能查看本单位的数据
|
||||
sb.Append("AND tba.UnitId = @UnitId ");
|
||||
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
|
||||
{
|
||||
sb.Append("AND tba.ProjectId = @ProjectId ");
|
||||
@@ -260,6 +267,8 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
return;
|
||||
}
|
||||
this.btnMenuView.Hidden = false;
|
||||
//this.btnNew.Hidden = false;
|
||||
this.btnImport.Hidden = false;
|
||||
if (this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sysglyId)
|
||||
{
|
||||
this.btnMenuDel.Hidden = false;
|
||||
@@ -272,6 +281,17 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 导入按钮
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnImport_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorSafetyIn.aspx?ProjectId={0}&UnitId={1}", this.CurrUser.LoginProjectId, this.CurrUser.UnitId, "导入 - ")));
|
||||
}
|
||||
|
||||
#region 导出按钮
|
||||
/// 导出按钮
|
||||
/// </summary>
|
||||
|
||||
Generated
+9
@@ -131,6 +131,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
/// <summary>
|
||||
/// btnImport 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnImport;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -19,6 +19,12 @@
|
||||
</f:DatePicker>
|
||||
<f:DatePicker ID="txtCompileDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm" Label="上报时间" Readonly="true">
|
||||
</f:DatePicker>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtUnitProjectName" runat="server" Label="单位项目" MaxLength="100" Readonly="true">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtCompileManName" runat="server" Label="上报人" MaxLength="50" Readonly="true">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using BLL;
|
||||
using NPOI.SS.Formula.Atp;
|
||||
using System;
|
||||
|
||||
namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
@@ -55,8 +56,9 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
{
|
||||
|
||||
this.drpYearMonth.SelectedDate = Convert.ToDateTime($"{model.Year}-{model.Month}");
|
||||
this.txtCompileDate.Text = model.CompileDate.ToShortDateString();
|
||||
this.txtCompileDate.Text = model.CompileDate.ToShortDateString();
|
||||
this.txtCompileManName.Text = model.CompileManName;
|
||||
this.txtUnitProjectName.Text = model.UnitProjectName;
|
||||
|
||||
this.txtWorkPlace.Text = model.WorkPlace;
|
||||
this.txtJobStep.Text = model.JobStep;
|
||||
|
||||
+9
@@ -59,6 +59,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtCompileDate;
|
||||
|
||||
/// <summary>
|
||||
/// txtUnitProjectName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtUnitProjectName;
|
||||
|
||||
/// <summary>
|
||||
/// txtCompileManName 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -273,7 +273,8 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
/// <param name="e"></param>
|
||||
protected void btnImport_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorSafetyIn.aspx?ProjectId={0}", this.ProjectId, "导入 - ")));
|
||||
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorSafetyIn.aspx?ProjectId={0}", this.ProjectId, "导入 - ")));
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorSafetyIn.aspx?ProjectId={0}&UnitId={1}", this.CurrUser.LoginProjectId, this.CurrUser.UnitId, "导入 - ")));
|
||||
}
|
||||
|
||||
#region 导出按钮
|
||||
|
||||
@@ -144,7 +144,18 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
var yearMonth2 = this.drpYearMonth.SelectedDate;
|
||||
model.Year = yearMonth.Split('-')[0];
|
||||
model.Month = yearMonth.Split('-')[1];
|
||||
model.ProjectId = this.ProjectId;
|
||||
if (!string.IsNullOrWhiteSpace(this.ProjectId))
|
||||
{
|
||||
var project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
|
||||
model.ProjectId = this.ProjectId;
|
||||
model.UnitProjectName = project.ProjectName;
|
||||
}
|
||||
else
|
||||
{
|
||||
var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId);
|
||||
model.UnitId = unit.UnitId;
|
||||
model.UnitProjectName = unit.UnitName;
|
||||
}
|
||||
model.WorkPlace = this.txtWorkPlace.Text.Trim();
|
||||
model.JobStep = this.txtJobStep.Text.Trim();
|
||||
model.Hazard = this.txtHazard.Text.Trim();
|
||||
|
||||
@@ -39,6 +39,20 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 单位id
|
||||
/// </summary>
|
||||
public string UnitId
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["UnitId"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["UnitId"] = value;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 操作人
|
||||
/// </summary>
|
||||
public string CompileMan
|
||||
@@ -75,6 +89,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.ProjectId = Request.Params["ProjectId"];
|
||||
this.UnitId = Request.Params["UnitId"];
|
||||
|
||||
|
||||
this.CompileMan = this.CurrUser.UserId;
|
||||
@@ -303,7 +318,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
else
|
||||
{
|
||||
Year = ct.Year.ToString();
|
||||
Month = ct.Month.ToString();
|
||||
Month = ct.Month > 9 ? ct.Month.ToString() : $"0{ct.Month}";
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -425,15 +440,29 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
return (lstError, null);
|
||||
}
|
||||
|
||||
string UnitProjectName = string.Empty;
|
||||
if (!string.IsNullOrWhiteSpace(this.ProjectId))
|
||||
{
|
||||
var project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId);
|
||||
UnitProjectName = project.ProjectName;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(this.UnitId))
|
||||
{
|
||||
var unit = BLL.UnitService.GetUnitByUnitId(this.UnitId);
|
||||
UnitProjectName = unit.UnitName;
|
||||
}
|
||||
|
||||
// 其余字段可根据实际业务映射到实体
|
||||
var entity = new Model.HazardFactor_Safety
|
||||
{
|
||||
ID = SQLHelper.GetNewID(typeof(Model.HazardFactor_Safety)),
|
||||
CompileDate=DateTime.Now,
|
||||
CompileDate = DateTime.Now,
|
||||
CompileMan = this.CompileMan,
|
||||
CompileManName = this.CompileManName,
|
||||
State = int.Parse(BLL.Const.State_1),//默认已提交
|
||||
ProjectId =this.ProjectId,
|
||||
ProjectId = this.ProjectId,
|
||||
UnitId = this.UnitId,
|
||||
UnitProjectName = UnitProjectName,
|
||||
Year = Year,
|
||||
Month = Month,
|
||||
WorkPlace = WorkPlace,
|
||||
|
||||
@@ -64,7 +64,10 @@
|
||||
</f:RadioButtonList>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
|
||||
<%--<f:Button ID="btnNew" ToolTip="新增" Text="新增" Icon="Add" EnablePostBack="false" runat="server" Hidden="true">
|
||||
</f:Button>--%>
|
||||
<f:Button ID="btnImport" ToolTip="导入" Text="导入" Icon="ApplicationGet" runat="server" OnClick="btnImport_Click" Hidden="true">
|
||||
</f:Button>
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
|
||||
EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
</f:Button>
|
||||
@@ -90,7 +93,9 @@
|
||||
<asp:Label ID="lbState" runat="server" Text='<%# ConvertDataState(Eval("State")) %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="180px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
|
||||
<%--<f:RenderField Width="180px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
|
||||
</f:RenderField>--%>
|
||||
<f:RenderField Width="180px" ColumnID="UnitProjectName" DataField="UnitProjectName" FieldType="String" HeaderText="单位项目名称" TextAlign="Center" HeaderTextAlign="Center" Locked="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="180px" ColumnID="WorkPlace" DataField="WorkPlace" SortField="WorkPlace" FieldType="String" HeaderText="活动区域/场所/设备" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
|
||||
</f:RenderField>
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
////权限按钮方法
|
||||
this.GetButtonPower();
|
||||
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
|
||||
//btnNew.OnClientClick = Window1.GetShowReference("HazardFactorSafetyEdit.aspx") + "return false;";
|
||||
// 绑定表格
|
||||
BindGrid();
|
||||
}
|
||||
@@ -64,20 +65,26 @@ 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,tbb.ProjectName,tba.* ");
|
||||
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.* ");
|
||||
}
|
||||
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,tbb.ProjectName,tba.* ");
|
||||
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.* ");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sb.Append("SELECT tbb.ProjectName,tba.* ");
|
||||
sb.Append("SELECT tba.* ");
|
||||
}
|
||||
sb.Append("FROM HazardFactor_Safety AS tba WITH(NOLOCK) ");
|
||||
sb.Append("LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId ");
|
||||
//sb.Append("LEFT JOIN Base_Project AS tbb WITH(NOLOCK) ON tbb.ProjectId = tba.ProjectId ");
|
||||
sb.Append("WHERE 1=1 AND tba.State = 1 ");//取已提交数据
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ)
|
||||
{//分公司只能查看本单位的数据
|
||||
sb.Append("AND tba.UnitId = @UnitId ");
|
||||
listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId));
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(this.drpProject.SelectedValue) && this.drpProject.SelectedValue != Const._Null)
|
||||
{
|
||||
sb.Append("AND tba.ProjectId = @ProjectId ");
|
||||
@@ -260,6 +267,8 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
return;
|
||||
}
|
||||
this.btnMenuView.Hidden = false;
|
||||
//this.btnNew.Hidden = false;
|
||||
this.btnImport.Hidden = false;
|
||||
if (this.CurrUser.UserId == Const.hfnbdId || this.CurrUser.UserId == Const.sysglyId)
|
||||
{
|
||||
this.btnMenuDel.Hidden = false;
|
||||
@@ -272,6 +281,17 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 导入按钮
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnImport_Click(object sender, EventArgs e)
|
||||
{
|
||||
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HazardFactorSafetyIn.aspx?ProjectId={0}&UnitId={1}", this.CurrUser.LoginProjectId, this.CurrUser.UnitId, "导入 - ")));
|
||||
}
|
||||
|
||||
#region 导出按钮
|
||||
/// 导出按钮
|
||||
/// </summary>
|
||||
|
||||
+9
@@ -131,6 +131,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
/// <summary>
|
||||
/// btnImport 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnImport;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -19,6 +19,12 @@
|
||||
</f:DatePicker>
|
||||
<f:DatePicker ID="txtCompileDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm" Label="上报时间" Readonly="true">
|
||||
</f:DatePicker>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtUnitProjectName" runat="server" Label="单位项目" MaxLength="100" Readonly="true">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtCompileManName" runat="server" Label="上报人" MaxLength="50" Readonly="true">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
|
||||
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
this.drpYearMonth.SelectedDate = Convert.ToDateTime($"{model.Year}-{model.Month}");
|
||||
this.txtCompileDate.Text = model.CompileDate.ToShortDateString();
|
||||
this.txtCompileManName.Text = model.CompileManName;
|
||||
this.txtUnitProjectName.Text = model.UnitProjectName;
|
||||
|
||||
this.txtWorkPlace.Text = model.WorkPlace;
|
||||
this.txtJobStep.Text = model.JobStep;
|
||||
|
||||
+9
@@ -59,6 +59,15 @@ namespace FineUIPro.Web.ReportManage.HazardFactor
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtCompileDate;
|
||||
|
||||
/// <summary>
|
||||
/// txtUnitProjectName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtUnitProjectName;
|
||||
|
||||
/// <summary>
|
||||
/// txtCompileManName 控件。
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user