lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
高飞
2024-05-27 16:34:45 +08:00
parent 493f1a5ab5
commit d554e7a6c9
20 changed files with 185 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
+1
View File
@@ -318,6 +318,7 @@ namespace FineUIPro.Web.HSSE.Check
else
{
this.RectifyNoticesId = newRectifyNotices.RectifyNoticesId = SQLHelper.GetNewID();
newRectifyNotices.ControlId = Request.Params["ControlId"];
RectifyNoticesService.AddRectifyNotices(newRectifyNotices);
}
if (saveType == Const.BtnSubmit)
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
+10
View File
@@ -266,6 +266,16 @@ namespace FineUIPro.Web.HSSE.Check
//// 根据明细ID判断是否全部整改完成 并更新专项检查状态
Check_CheckSpecialService.UpdateCheckSpecialStates(getcheck.FirstOrDefault().CheckSpecialId);
}
// 回写施工作业风险
if (!string.IsNullOrEmpty(getRectifyNotices.ControlId))
{
var constructionRiskControl = Funs.DB.HSSE_ConstructionRiskControl.FirstOrDefault(x => x.ControlId == getRectifyNotices.ControlId);
if (constructionRiskControl != null)
{
constructionRiskControl.CheckResult = "符合";
Funs.DB.SubmitChanges();
}
}
}
else
{
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
+7 -4
View File
@@ -30,14 +30,14 @@
TitleToolTip="施工作业风险" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="危险源台账" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id"
runat="server" BoxFlex="1" DataKeyNames="Id" ForceFit="true"
EnableColumnLines="true" DataIDField="Id" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server" Position="Top">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Icon="SystemSave" runat="server" ToolTip="添加" Text="添加" ValidateForms="SimpleForm1"
<f:Button ID="btnNew" Icon="Add" runat="server" ToolTip="添加" Text="添加" ValidateForms="SimpleForm1"
OnClick="btnNew_Click">
</f:Button>
@@ -79,7 +79,7 @@
SortField="RiskLevel" FieldType="String" HeaderText="风险等级" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Measures" DataField="Measures" ExpandUnusedSpace="true"
<f:RenderField Width="200px" ColumnID="Measures" DataField="Measures"
SortField="Measures" FieldType="String" HeaderText="管控措施" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
@@ -87,7 +87,10 @@
SortField="FlowOperateName" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="CheckResult" DataField="CheckResult"
SortField="CheckResult" FieldType="String" HeaderText="检查结果" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs
+33 -10
View File
@@ -183,9 +183,9 @@ namespace FineUIPro.Web.HSSE.Hazard
{
if (this.tvControlItem.SelectedNode != null && this.tvControlItem.SelectedNode.NodeID.Contains("|"))
{
var ids= this.tvControlItem.SelectedNode.NodeID.Split('|');
var ids = this.tvControlItem.SelectedNode.NodeID.Split('|');
string strSql = @"select c.UnitWorkName, '' Id,*
,(CASE WHEN a.States = " + BLL.Const.State_3 + " THEN '审核/审批完成' when a.States = " + BLL.Const.State_0 + " OR a.States IS NULL THEN '待提交' WHEN a.States = " + BLL.Const.State_2 + " THEN '待总包安全经理审核' ELSE '待['+OperateUser.PersonName+']办理' END) AS FlowOperateName"
,b.CheckResult,(CASE WHEN a.States = " + BLL.Const.State_3 + " THEN '审核/审批完成' when a.States = " + BLL.Const.State_0 + " OR a.States IS NULL THEN '待提交' WHEN a.States = " + BLL.Const.State_2 + " THEN '待总包安全经理审核' ELSE '待['+OperateUser.PersonName+']办理' END) AS FlowOperateName"
+ @" from [dbo].[HSSE_ConstructionRisk] a left join [dbo].[HSSE_ConstructionRiskControl] b
on a.ConstructionRiskId =b.ConstructionRiskId left join WBS_UnitWork c on a.WorkAreaId = c.UnitWorkId
LEFT JOIN Sys_FlowOperate AS FlowOperate ON a.ConstructionRiskId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1
@@ -193,18 +193,23 @@ namespace FineUIPro.Web.HSSE.Hazard
where a.UnitId=@UnitId and a.DateWeek=@DateWeek order by a.[ConstructionContent],b.[ShowIndex]";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@UnitId", ids[0]));
listStr.Add(new SqlParameter("@DateWeek", ids[1]));
listStr.Add(new SqlParameter("@DateWeek", ids[1]));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
foreach(DataRow row in tb.Rows)
foreach (DataRow row in tb.Rows)
{
row["Id"] = row["ConstructionRiskId"] +"|"+ row["ControlId"];
row["Id"] = row["ConstructionRiskId"] + "|" + row["ControlId"];
}
Grid1.DataSource = tb;
Grid1.DataBind();
}
else
{
Grid1.DataSource = null;
Grid1.DataBind();
}
}
#region 绑定树节点
/// <summary>
@@ -286,13 +291,31 @@ namespace FineUIPro.Web.HSSE.Hazard
protected void btnAudit_Click(object sender, EventArgs e)
{
var risks = Funs.DB.HSSE_ConstructionRisk.Where(x => x.States == "2");
foreach (var r in risks)
//if (Grid1.SelectedRowIndexArray.Length == 0)
//{
// Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
// return;
//}
//foreach (int rowIndex in Grid1.SelectedRowIndexArray)
//{
// string rowID = Grid1.DataKeys[rowIndex][0].ToString();
// var ids = rowID.Split('|');
// if (ids.Length >= 1)
// {
// var r = Funs.DB.HSSE_ConstructionRisk.FirstOrDefault(x => x.ConstructionRiskId == ids[0]);
// if (r != null && r.States == "2")
// {
// r.States = "3";
// }
// }
//}
var r = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId==this.CurrUser.LoginProjectId && x.States == "2");
foreach (var item in r)
{
r.States = "3";
item.States = "3";
}
Funs.DB.SubmitChanges();
BindGrid();
}
#region 点击TreeView
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.cs
+1
View File
@@ -97,6 +97,7 @@ namespace FineUIPro.Web.HSSE.Hazard
if (newconstructionRisk != null)
{
newconstructionRisk.CheckMan = this.CurrUser.PersonId;
newconstructionRisk.CheckResult = rbCheckResult.SelectedValue;
newconstructionRisk.Rectification = rbRectification.SelectedValue;
}
SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
+5 -5
View File
@@ -54,10 +54,10 @@
<f:DropDownList ID="drpRiskLevel" runat="server" EnableEdit="true" Label="风险等级" LabelWidth="140px"
AutoPostBack="true" >
<f:ListItem Value="" Text="- 请选择 -" />
<f:ListItem Value="一级风险" Text="一级风险" />
<f:ListItem Value="二级风险" Text="二级风险" />
<f:ListItem Value="三级风险" Text="三级风险" />
<f:ListItem Value="四级风险" Text="四级风险" />
<f:ListItem Value="低风险" Text="低风险" />
<f:ListItem Value="一般风险" Text="一般风险" />
<f:ListItem Value="较大风险" Text="较大风险" />
<f:ListItem Value="重大风险" Text="重大风险" />
</f:DropDownList>
</Items>
</f:FormRow>
@@ -96,7 +96,7 @@
<f:RenderField Width="40px" ColumnID="CheckResult" DataField="CheckResult" FieldType="String"
HeaderText="检查结果" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="40px" ColumnID="Rectification" DataField="Rectification"
<f:RenderField Width="40px" ColumnID="Rectification" DataField="Rectification" Hidden="true"
FieldType="String" HeaderText="环境因素" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
+2 -1
View File
@@ -32,7 +32,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
ViewState["ControlId"] = value;
}
}
/// <summary>
/// 图片路径
/// </summary>
@@ -299,6 +299,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
register.HazardRegisterId = SQLHelper.GetNewID();
HazardRegisterId = register.HazardRegisterId;
register.CheckTime = DateTime.Now;
register.ControlId = Request.Params["ControlId"];
BLL.HSSE_Hazard_HazardRegisterService.AddHazardRegister(register);
BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnAdd);
}
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs
+10
View File
@@ -140,6 +140,16 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
if (this.ckConfirm.SelectedValue == "True") //通过
{
register.States = "3"; //已闭环
// 回写施工作业风险
if (!string.IsNullOrEmpty(register.ControlId))
{
var constructionRiskControl = Funs.DB.HSSE_ConstructionRiskControl.FirstOrDefault(x => x.ControlId == register.ControlId);
if (constructionRiskControl != null)
{
constructionRiskControl.CheckResult = "符合";
Funs.DB.SubmitChanges();
}
}
}
else //未通过
{