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

20230607新增月报费用取值，上报集团报表（月报）默认自动取值功能新增

Browse Source
This commit is contained in:
杨红卫
2023-06-07 18:01:30 +08:00
parent e4871bc690
commit c7994e1a5c
21 changed files with 914 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx
+11 -12
View File
@@ -6,7 +6,6 @@
<head runat="server">
<link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="~/Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<title>安全风险</title>
</head>
<body>
@@ -25,8 +24,8 @@
<Items>
<f:DropDownList ID="drpProject" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
</f:DropDownList>
<%-- <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
</f:DropDownList>
<%-- <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
</f:DatePicker>
<f:Label ID="Label3" runat="server" Text="至">
@@ -34,7 +33,7 @@
<f:DatePicker ID="txtEndTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px">
</f:DatePicker>--%>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
</Items>
@@ -52,23 +51,23 @@
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="低风险" HeaderTextAlign="Center" TextAlign="Right">
</f:RenderField>
<f:TemplateField ColumnID="Count1" Width="120px" HeaderText="低风险" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Count1(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="一般风险" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count2" Width="120px" HeaderText="一般风险" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Count2(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="较大风险" HeaderTextAlign="Center" TextAlign="Right">
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="较大风险" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label4" runat="server" Text='<%# Count3(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="Count3" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
</f:TemplateField>
<f:TemplateField ColumnID="Count4" Width="120px" HeaderText="重大风险" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# Count4(Eval("ProjectId")) %>'></asp:Label>
</ItemTemplate>
@@ -91,7 +90,7 @@
</f:Panel>
<f:Window ID="Window1" Title="详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="620px" Maximized="true">
Width="1200px" Height="620px" Maximized="true">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs
+30 -28
View File
@@ -1,4 +1,5 @@
using BLL;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
@@ -39,10 +40,10 @@ namespace FineUIPro.Web.DataShow
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
{
strSql += " AND projectId = @projectId"; ///状态为已完成
strSql += " AND projectId = @projectId";
listStr.Add(new SqlParameter("@projectId", this.drpProject.SelectedValue));
}
//if (!string.IsNullOrEmpty(this.txtStartTime.Text))
//{
// strSql += " AND h.RegisterDate >=@StartTime";
@@ -57,7 +58,7 @@ namespace FineUIPro.Web.DataShow
// cpara += " AND c.RegisterDate <=" + this.txtEndTime.Text;
//}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
@@ -165,7 +166,7 @@ namespace FineUIPro.Web.DataShow
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected int Count1(object projectId)
public int Count1(object projectId)
{
int cout1 = 0;
if (projectId != null)
@@ -180,14 +181,14 @@ namespace FineUIPro.Web.DataShow
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected int Count2(object projectId)
public int Count2(object projectId)
{
int cout1 = 0;
int cout4 = 0;
if (projectId != null)
{
cout1 = getcount(projectId.ToString(),2);
cout4 = getcount(projectId.ToString(),2);
}
return cout1;
return cout4;
}
/// <summary>
@@ -195,36 +196,26 @@ namespace FineUIPro.Web.DataShow
/// </summary>
/// <param name="state"></param>
/// <returns></returns>
protected int Count3(object projectId)
public int Count3(object projectId)
{
int cout1 = 0;
int cout3 = 0;
if (projectId != null)
{
cout1= getcount(projectId.ToString(), 3);
cout3 = getcount(projectId.ToString(), 3);
}
return cout1;
return cout3;
}
protected int Count4(object projectId)
public int Count4(object projectId)
{
int cout1 = 0;
int cout4 = 0;
if (projectId != null)
{
cout1 = getcount(projectId.ToString(), 4);
cout4 = getcount(projectId.ToString(), 4);
}
return cout1;
return cout4;
}
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Hazard_HazardList> getDataLists = from x in Funs.DB.Hazard_HazardList
select x;
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Hazard_HazardSelectedItem> getDataItemLists = from x in Funs.DB.Hazard_HazardSelectedItem
where x.IsStart == true
select x;
/// <summary>
///
/// </summary>
@@ -237,7 +228,18 @@ namespace FineUIPro.Web.DataShow
var getlevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x => x.RiskLevel == level);
if (getlevel != null)
{
count = getDataItemLists.Where(x => x.ProjectId == projectId && x.HazardLevel == getlevel.RiskLevelId).Count();
count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2
select x).Count();
}
else
{
count = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId
where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2
select x).Count();
}
return count;
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx
+11 -11
View File
@@ -88,23 +88,23 @@
<f:RenderField Width="100px" ColumnID="HelperMethod" DataField="HelperMethod" FieldType="String"
HeaderText="辅助方法" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
HeaderText="危险评价(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
<f:RenderField Width="60px" ColumnID="L" DataField="HazardJudge_L" FieldType="String"
HeaderText="(L)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
HeaderText="危险评价(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
<f:RenderField Width="60px" ColumnID="E" DataField="HazardJudge_E" FieldType="String"
HeaderText="(E)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
HeaderText="危险评价(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
<f:RenderField Width="60px" ColumnID="C" DataField="HazardJudge_C" FieldType="String"
HeaderText="(C)" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
HeaderText="危险评价(D)" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="60px" ColumnID="D" DataField="HazardJudge_D" FieldType="Double"
HeaderText="(D)" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="G" DataField="RiskLevelName" FieldType="String"
HeaderText="危险级别" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="ControlMeasures" DataField="ControlMeasures"
FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Center">
FieldType="String" HeaderText="控制措施" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
<Listeners>
SGGL/FineUIPro.Web/DataShow/SecurityRiskItem.aspx.cs
+3 -3
View File
@@ -34,10 +34,10 @@ namespace FineUIPro.Web.DataShow
/// </summary>
private void BindGrid()
{
string strSql = @"select Item.HazardId AS HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
string strSql = @"select (Item.HazardId+'-'+ Item.HazardListId) as HazardSelectedItemId,Item.HazardListId,List.IdentificationDate,List.WorkAreaName,Item.WorkStage,Item.HazardListTypeId
, Item.HazardListTypeId,Item.HazardId,Item.HazardItems,Item.DefectsType,Item.MayLeadAccidents
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E
,level.RiskLevelName,Item.ControlMeasures
,Item.HelperMethod,Item.HazardJudge_L,Item.HazardJudge_E,Item.HazardJudge_C,Item.HazardJudge_E,Item.HazardJudge_D,Item.ControlMeasures
,(CASE WHEN level.RiskLevelName IS NULL THEN Item.HazardLevel ELSE level.RiskLevelName END) AS RiskLevelName
from Hazard_HazardSelectedItem AS Item
LEFT JOIN Hazard_HazardList AS List on List.HazardListId = Item.HazardListId
LEFT JOIN Base_RiskLevel as level on level.RiskLevelId = Item.HazardLevel