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

1HSE不符合项清单和统计功能

Browse Source
This commit is contained in:
夏菊
2026-06-06 11:04:42 +08:00
parent 9140eab873
commit 6a4248f0e5
8 changed files with 1174 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Check/HSE/CheckProblem.aspx
+14 -2
View File
@@ -155,11 +155,23 @@
</f:RenderField>
<f:RenderField Width="140px" HeaderText="问题分类" ColumnID="ClassifyName" DataField="ClassifyName" SortField="ClassifyName" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" HeaderText="分类明细" ColumnID="ClassifyItemName" DataField="ClassifyItemName" SortField="ClassifyItemName" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
<%--<f:RenderField Width="200px" HeaderText="分类明细" ColumnID="ClassifyItemName" DataField="ClassifyItemName" SortField="ClassifyItemName" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
<f:RenderField Width="200px" HeaderText="S1安全管理" ColumnID="S1Name" DataField="S1Name" SortField="S1Name" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" HeaderText="S2施工作业" ColumnID="S2Name" DataField="S2Name" SortField="S2Name" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="140px" HeaderText="问题性质" ColumnID="NatureName" DataField="NatureName" SortField="NatureName" FieldType="String" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="260px" HeaderText="性质明细" ColumnID="NatureItemContent" DataField="NatureItemContent" SortField="NatureItemContent" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
<%--<f:RenderField Width="260px" HeaderText="性质明细" ColumnID="NatureItemContent" DataField="NatureItemContent" SortField="NatureItemContent" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>--%>
<f:RenderField Width="260px" HeaderText="管控红线" ColumnID="N1Content" DataField="N1Content" SortField="N1Content" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="260px" HeaderText="危险作业许可" ColumnID="N2Content" DataField="N2Content" SortField="N2Content" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="260px" HeaderText="较大隐患" ColumnID="N3Content" DataField="N3Content" SortField="N3Content" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark" FieldType="String" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<%--<f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
SGGL/FineUIPro.Web/Check/HSE/CheckProblem.aspx.cs
+13 -2
View File
@@ -133,14 +133,25 @@ namespace FineUIPro.Web.Check.HSE
protected DataTable ChecklistData()
{
StringBuilder sb = new StringBuilder();
sb.Append("SELECT spc.ClassifyName,s1.ClassifyItemName AS S1Name,s2.ClassifyItemName AS S2Name,spn.NatureName,n1.NatureItemContent AS N1Content,n2.NatureItemContent AS N2Content,n3.NatureItemContent AS N3Content,tba.* ");
sb.Append("FROM CheckProblem_Safety AS tba WITH(NOLOCK) ");
sb.Append("LEFT JOIN Base_SafetyProblemClassify AS spc ON spc.ClassifyId=tba.ClassifyId ");
sb.Append($"LEFT JOIN Base_SafetyProblemClassifyItem AS s1 ON s1.ClassifyItemId=tba.ClassifyItemId and s1.ClassifyId='{Const.SafetyClassifyIdS1}' ");
sb.Append($"LEFT JOIN Base_SafetyProblemClassifyItem AS s2 ON s2.ClassifyItemId=tba.ClassifyItemId and s2.ClassifyId='{Const.SafetyClassifyIdS2}' ");
sb.Append("LEFT JOIN Base_SafetyProblemNature AS spn ON spn.NatureId=tba.NatureId ");
sb.Append($"LEFT JOIN Base_SafetyProblemNatureItem AS n1 ON n1.NatureItemId=tba.NatureItemId and n1.NatureId='{Const.SafetyNatureIdN1}' ");
sb.Append($"LEFT JOIN Base_SafetyProblemNatureItem AS n2 ON n2.NatureItemId=tba.NatureItemId and n2.NatureId='{Const.SafetyNatureIdN2}' ");
sb.Append($"LEFT JOIN Base_SafetyProblemNatureItem AS n3 ON n3.NatureItemId=tba.NatureItemId and n3.NatureId='{Const.SafetyNatureIdN3}' ");
sb.Append("WHERE 1=1 ");
/*
sb.Append("SELECT spc.ClassifyName,spcItem.ClassifyItemName,spn.NatureName,spnItem.NatureItemContent,tba.* ");
sb.Append("FROM CheckProblem_Safety AS tba WITH(NOLOCK) ");
sb.Append("LEFT JOIN Base_SafetyProblemClassify AS spc ON spc.ClassifyId=tba.ClassifyId ");
sb.Append("LEFT JOIN Base_SafetyProblemClassifyItem AS spcItem ON spcItem.ClassifyItemId=tba.ClassifyItemId ");
sb.Append("LEFT JOIN Base_SafetyProblemNature AS spn ON spn.NatureId=tba.NatureId ");
sb.Append("LEFT JOIN Base_SafetyProblemNatureItem AS spnItem ON spnItem.NatureItemId=tba.NatureItemId ");
sb.Append("WHERE 1=1 ");
sb.Append("WHERE 1=1 ");*/
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && (this.CurrUser.UserId != Const.hfnbdId || this.CurrUser.UserId != Const.sysglyId))
{