1
This commit is contained in:
@@ -6,6 +6,12 @@
|
||||
<head runat="server">
|
||||
<title>企业安全数据统计月报</title>
|
||||
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
<style>
|
||||
.f-grid-colheader-text {
|
||||
white-space: normal;
|
||||
word-break: break-all;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
@@ -67,6 +73,9 @@
|
||||
<f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
|
||||
HeaderText="总工时数(万)" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
|
||||
HeaderText="去除系统内单位的总工时数(万)" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
|
||||
<Columns>
|
||||
<f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
|
||||
|
||||
@@ -77,6 +77,7 @@ namespace FineUIPro.Web.InformationProject
|
||||
+ @"MillionsMonthlyReport.ContractorNum,"
|
||||
+ @"MillionsMonthlyReport.SumPersonNum,"
|
||||
+ @"MillionsMonthlyReport.TotalWorkNum,"
|
||||
+ @"MillionsMonthlyReport.OutSideUnitWorkNum,"
|
||||
+ @"MillionsMonthlyReport.DeathAccidentNum,"
|
||||
+ @"MillionsMonthlyReport.DeathAccidentPersonNum,"
|
||||
+ @"MillionsMonthlyReport.DeathAccidentLossHour,"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<f:FormRow ColumnWidths="20% 20% 25% 35%">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpYear" runat="server" Label="年度" EnableEdit="true" LabelAlign="Right"
|
||||
Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpYear_SelectedIndexChanged">
|
||||
@@ -37,6 +37,8 @@
|
||||
</f:NumberBox>--%>
|
||||
<f:TextBox ID="txtTotalWorkNum" runat="server" Label="总工时数(万)" LabelWidth="140px" LabelAlign="Right" EmptyText="0">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtOutSideUnitWorkNum" runat="server" Label="去除系统内单位的总工时数(万)" LabelWidth="240px" LabelAlign="Right" EmptyText="0">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<%-- <f:FormRow>
|
||||
|
||||
@@ -84,6 +84,10 @@ namespace FineUIPro.Web.InformationProject
|
||||
{
|
||||
this.txtTotalWorkNum.Text = Convert.ToString(millionsMonthlyReport.TotalWorkNum);
|
||||
}
|
||||
if (millionsMonthlyReport.OutSideUnitWorkNum != null)
|
||||
{
|
||||
this.txtOutSideUnitWorkNum.Text = Convert.ToString(millionsMonthlyReport.OutSideUnitWorkNum);
|
||||
}
|
||||
if (millionsMonthlyReport.PostPersonNum != null)
|
||||
{
|
||||
this.txtPostPersonNum.Text = Convert.ToString(millionsMonthlyReport.PostPersonNum);
|
||||
@@ -363,6 +367,7 @@ namespace FineUIPro.Web.InformationProject
|
||||
millionsMonthlyReport.ContractorNum = Funs.GetNewIntOrZero(this.txtContractorNum.Text.Trim());
|
||||
millionsMonthlyReport.SumPersonNum = millionsMonthlyReport.PostPersonNum + millionsMonthlyReport.SnapPersonNum + millionsMonthlyReport.ContractorNum;
|
||||
millionsMonthlyReport.TotalWorkNum = Funs.GetNewDecimalOrZero(this.txtTotalWorkNum.Text.Trim());
|
||||
millionsMonthlyReport.OutSideUnitWorkNum = Funs.GetNewDecimalOrZero(this.txtOutSideUnitWorkNum.Text.Trim());
|
||||
millionsMonthlyReport.SeriousInjuriesNum = Funs.GetNewInt(this.txtSeriousInjuriesNum.Text.Trim());
|
||||
millionsMonthlyReport.SeriousInjuriesPersonNum = Funs.GetNewInt(this.txtSeriousInjuriesPersonNum.Text.Trim());
|
||||
millionsMonthlyReport.SeriousInjuriesLossHour = Funs.GetNewInt(this.txtSeriousInjuriesLossHour.Text.Trim());
|
||||
@@ -471,7 +476,18 @@ namespace FineUIPro.Web.InformationProject
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
int? sumTotalPanhours = 0;
|
||||
|
||||
int? sumOutSideTotalPanhours = 0;
|
||||
List<string> outSideUnitIds = new List<string>();
|
||||
var projectUnits = from x in db.Project_ProjectUnit
|
||||
where x.ProjectId == this.ProjectId
|
||||
select x;
|
||||
foreach (var projectUnit in projectUnits)
|
||||
{
|
||||
if (projectUnit.UnitType == BLL.Const.ProjectUnitType_1 || projectUnit.IsOutSideUnit == true)
|
||||
{
|
||||
outSideUnitIds.Add(projectUnit.UnitId);
|
||||
}
|
||||
}
|
||||
//获取当期人工时日报
|
||||
List<Model.SitePerson_DayReport> dayReports = BLL.SitePerson_DayReportService.GetDayReportsByCompileDate(startTime, endTime, this.ProjectId);
|
||||
if (dayReports.Count > 0)
|
||||
@@ -479,10 +495,15 @@ namespace FineUIPro.Web.InformationProject
|
||||
foreach (var dayReport in dayReports)
|
||||
{
|
||||
sumTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail where y.DayReportId == dayReport.DayReportId select y.PersonWorkTime as decimal?).Sum());
|
||||
sumOutSideTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail
|
||||
where y.DayReportId == dayReport.DayReportId && outSideUnitIds.Contains(y.UnitId)
|
||||
select y.PersonWorkTime as decimal?).Sum());
|
||||
}
|
||||
|
||||
//总工时数(万)
|
||||
this.txtTotalWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumTotalPanhours), 4) / 10000, 4).ToString();
|
||||
//去除系统内单位的总工时数(万)
|
||||
this.txtOutSideUnitWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumOutSideTotalPanhours), 4) / 10000, 4).ToString();
|
||||
//在岗员工
|
||||
//获取单位集合
|
||||
var unitIds = (from x in dayReports
|
||||
|
||||
+9
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.InformationProject {
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtTotalWorkNum;
|
||||
|
||||
/// <summary>
|
||||
/// txtOutSideUnitWorkNum 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtOutSideUnitWorkNum;
|
||||
|
||||
/// <summary>
|
||||
/// GroupPanel1 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<f:FormRow ColumnWidths="20% 20% 25% 35%">
|
||||
<Items>
|
||||
<f:TextBox ID="txtYear" runat="server" Label="年度" LabelAlign="Right" Readonly="true">
|
||||
</f:TextBox>
|
||||
@@ -32,6 +32,8 @@
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtTotalWorkNum" runat="server" Label="总工时数(万)" Readonly="true" LabelWidth="140px" LabelAlign="Right" EmptyText="0">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtOutSideUnitWorkNum" runat="server" Label="去除系统内单位的总工时数(万)" LabelWidth="240px" Readonly="true" LabelAlign="Right" EmptyText="0">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<%-- <f:FormRow>
|
||||
|
||||
@@ -82,6 +82,10 @@ namespace FineUIPro.Web.InformationProject
|
||||
{
|
||||
this.txtTotalWorkNum.Text = Convert.ToString(millionsMonthlyReport.TotalWorkNum);
|
||||
}
|
||||
if (millionsMonthlyReport.OutSideUnitWorkNum != null)
|
||||
{
|
||||
this.txtOutSideUnitWorkNum.Text = Convert.ToString(millionsMonthlyReport.OutSideUnitWorkNum);
|
||||
}
|
||||
if (millionsMonthlyReport.PostPersonNum != null)
|
||||
{
|
||||
this.txtPostPersonNum.Text = Convert.ToString(millionsMonthlyReport.PostPersonNum);
|
||||
|
||||
+9
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.InformationProject {
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtTotalWorkNum;
|
||||
|
||||
/// <summary>
|
||||
/// txtOutSideUnitWorkNum 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtOutSideUnitWorkNum;
|
||||
|
||||
/// <summary>
|
||||
/// GroupPanel1 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -82,6 +82,9 @@
|
||||
<f:CheckBoxField Width="100px" SortField="IsSynchro" RenderAsStaticField="true" DataField="IsSynchro"
|
||||
HeaderText="同步实名制" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:CheckBoxField>
|
||||
<f:CheckBoxField Width="120px" SortField="IsOutSideUnit" RenderAsStaticField="true" DataField="IsOutSideUnit"
|
||||
HeaderText="系统外单位" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:CheckBoxField>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
|
||||
@@ -49,7 +49,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
if (this.drpProject.Items.Count() > 0)
|
||||
{
|
||||
string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName
|
||||
,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime,ProjectUnit.IsSynchro "
|
||||
,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime,ProjectUnit.IsSynchro,ProjectUnit.IsOutSideUnit "
|
||||
+ @" FROM Project_ProjectUnit AS ProjectUnit "
|
||||
+ @" LEFT JOIN Base_Project AS Project ON ProjectUnit.ProjectId = Project.ProjectId "
|
||||
+ @" LEFT JOIN Base_Unit AS Unit ON ProjectUnit.UnitId = Unit.UnitId "
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
|
||||
<f:CheckBox runat="server" ID="ckIsOutSideUnit" Label="是否系统外单位"></f:CheckBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
|
||||
@@ -113,6 +113,10 @@ namespace FineUIPro.Web.ProjectData
|
||||
{
|
||||
this.ckIsSynchro.Checked = true;
|
||||
}
|
||||
if (projectUnit.IsOutSideUnit == true)
|
||||
{
|
||||
this.ckIsOutSideUnit.Checked = true;
|
||||
}
|
||||
}
|
||||
|
||||
this.BindGrid();
|
||||
@@ -147,7 +151,14 @@ namespace FineUIPro.Web.ProjectData
|
||||
{
|
||||
newProjectUnit.IsSynchro = false;
|
||||
}
|
||||
|
||||
if (this.ckIsOutSideUnit.Checked)
|
||||
{
|
||||
newProjectUnit.IsOutSideUnit = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
newProjectUnit.IsOutSideUnit = null;
|
||||
}
|
||||
BLL.ProjectUnitService.UpdateProjectUnit(newProjectUnit);
|
||||
Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(newProjectUnit.UnitId);
|
||||
if (unit != null)
|
||||
|
||||
+48
-41
@@ -7,13 +7,11 @@
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.ProjectData
|
||||
{
|
||||
|
||||
|
||||
public partial class ProjectUnitSave
|
||||
{
|
||||
|
||||
namespace FineUIPro.Web.ProjectData {
|
||||
|
||||
|
||||
public partial class ProjectUnitSave {
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbProjectName 控件。
|
||||
/// </summary>
|
||||
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbProjectName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbUnitName 控件。
|
||||
/// </summary>
|
||||
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbUnitName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpUnitType 控件。
|
||||
/// </summary>
|
||||
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpUnitType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCollCropCode 控件。
|
||||
/// </summary>
|
||||
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCollCropCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtLinkName 控件。
|
||||
/// </summary>
|
||||
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtLinkName;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpIdcardType 控件。
|
||||
/// </summary>
|
||||
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpIdcardType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtIdcardNumber 控件。
|
||||
/// </summary>
|
||||
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtIdcardNumber;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtLinkMobile 控件。
|
||||
/// </summary>
|
||||
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtLinkMobile;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rblIsChina 控件。
|
||||
/// </summary>
|
||||
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rblIsChina;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rblCollCropStatus 控件。
|
||||
/// </summary>
|
||||
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rblCollCropStatus;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtInTime 控件。
|
||||
/// </summary>
|
||||
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtInTime;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtOutTime 控件。
|
||||
/// </summary>
|
||||
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtOutTime;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ckIsSynchro 控件。
|
||||
/// </summary>
|
||||
@@ -157,7 +155,16 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckIsSynchro;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ckIsOutSideUnit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.CheckBox ckIsOutSideUnit;
|
||||
|
||||
/// <summary>
|
||||
/// nbPlanCostA 控件。
|
||||
/// </summary>
|
||||
@@ -166,7 +173,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox nbPlanCostA;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// nbPlanCostB 控件。
|
||||
/// </summary>
|
||||
@@ -175,7 +182,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox nbPlanCostB;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtContractRange 控件。
|
||||
/// </summary>
|
||||
@@ -184,7 +191,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtContractRange;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// tr0 控件。
|
||||
/// </summary>
|
||||
@@ -193,7 +200,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.FormRow tr0;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// hdProjectUnitItemId 控件。
|
||||
/// </summary>
|
||||
@@ -202,7 +209,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label hdProjectUnitItemId;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtContractNum 控件。
|
||||
/// </summary>
|
||||
@@ -211,7 +218,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtContractNum;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtTotalMoney 控件。
|
||||
/// </summary>
|
||||
@@ -220,7 +227,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox txtTotalMoney;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtHSEMoney 控件。
|
||||
/// </summary>
|
||||
@@ -229,7 +236,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox txtHSEMoney;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
@@ -238,7 +245,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
@@ -247,7 +254,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
@@ -256,7 +263,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnAdd 控件。
|
||||
/// </summary>
|
||||
@@ -265,7 +272,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnAdd;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnItemSave 控件。
|
||||
/// </summary>
|
||||
@@ -274,7 +281,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnItemSave;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
@@ -283,7 +290,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
@@ -292,7 +299,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
@@ -301,7 +308,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
@@ -310,7 +317,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuEdit 控件。
|
||||
/// </summary>
|
||||
@@ -319,7 +326,7 @@ namespace FineUIPro.Web.ProjectData
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuEdit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -162,6 +162,9 @@
|
||||
<f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
|
||||
HeaderText="总工时数(万)" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
|
||||
HeaderText="去除系统内单位的总工时数(万)" HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
|
||||
<Columns>
|
||||
<f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
|
||||
|
||||
@@ -123,6 +123,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
yearTotalItem.ContractorNum = yearSumItems.Sum(x => x.ContractorNum ?? 0);
|
||||
yearTotalItem.SumPersonNum = yearSumItems.Sum(x => x.SumPersonNum ?? 0);
|
||||
yearTotalItem.TotalWorkNum = yearSumItems.Sum(x => x.TotalWorkNum ?? 0);
|
||||
yearTotalItem.OutSideUnitWorkNum = yearSumItems.Sum(x => x.OutSideUnitWorkNum ?? 0);
|
||||
yearTotalItem.SeriousInjuriesNum = yearSumItems.Sum(x => x.SeriousInjuriesNum ?? 0);
|
||||
yearTotalItem.SeriousInjuriesPersonNum = yearSumItems.Sum(x => x.SeriousInjuriesPersonNum ?? 0);
|
||||
yearTotalItem.SeriousInjuriesLossHour = yearSumItems.Sum(x => x.SeriousInjuriesLossHour ?? 0);
|
||||
|
||||
@@ -12,6 +12,11 @@
|
||||
white-space: normal;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.f-grid-colheader-text {
|
||||
white-space: normal;
|
||||
word-break: break-all;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
@@ -270,6 +275,16 @@
|
||||
</f:NumberBox>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="110px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
|
||||
HeaderText="去除系统内单位的总工时数(万)" HeaderTextAlign="Center">
|
||||
<Editor>
|
||||
<%-- <f:TextBox runat="server" ID="txtTotalWorkNum" Text='<%# Eval("TotalWorkNum")%>'>
|
||||
</f:TextBox>--%>
|
||||
<f:NumberBox ID="txtOutSideUnitWorkNum" NoDecimal="false" NoNegative="true" MinValue="0.00"
|
||||
Text='<%# Eval("TotalWorkNum")%>' runat="server" DecimalPrecision="4">
|
||||
</f:NumberBox>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
|
||||
<Columns>
|
||||
<f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
|
||||
|
||||
@@ -464,7 +464,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
#region 增加本月明细
|
||||
private void GetItems(string millionsMonthlyReportId)
|
||||
{
|
||||
decimal TotalWorkNumSum = 0;
|
||||
decimal TotalWorkNumSum = 0, OutSideUnitWorkNumSum = 0;
|
||||
int PostPersonNumSum = 0, SnapPersonNumSum = 0, ContractorNumSum = 0, SumPersonNumSum = 0, SeriousInjuriesNumSum = 0, SeriousInjuriesPersonNumSum = 0, SeriousInjuriesLossHourSum = 0, MinorAccidentNumSum = 0,
|
||||
MinorAccidentPersonNumSum = 0, MinorAccidentLossHourSum = 0, DeathAccidentNumSum = 0, DeathAccidentPersonNumSum = 0, DeathAccidentLossHourSum = 0, RestrictedWorkPersonNumSum = 0, RestrictedWorkLossHourSum = 0, MedicalTreatmentPersonNumSum = 0, MedicalTreatmentLossHourSum = 0,
|
||||
FireNumSum = 0, EnvironmenNumSum = 0, TrafficNumSum = 0, EquipmentNumSum = 0, QualityNumSum = 0, OtherNumSum = 0, FirstAidDressingsNumSum = 0, AttemptedEventNumSum = 0, LossDayNumSum = 0;
|
||||
@@ -535,6 +535,15 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
{
|
||||
item.TotalWorkNum = 0;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(values["OutSideUnitWorkNum"].ToString()))
|
||||
{
|
||||
item.OutSideUnitWorkNum = values.Value<decimal>("OutSideUnitWorkNum");
|
||||
OutSideUnitWorkNumSum += values.Value<decimal>("OutSideUnitWorkNum");
|
||||
}
|
||||
else
|
||||
{
|
||||
item.OutSideUnitWorkNum = 0;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(values["SeriousInjuriesNum"].ToString()))
|
||||
{
|
||||
item.SeriousInjuriesNum = values.Value<int>("SeriousInjuriesNum");
|
||||
@@ -741,6 +750,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
ContractorNum = ContractorNumSum,
|
||||
SumPersonNum = SumPersonNumSum,
|
||||
TotalWorkNum = TotalWorkNumSum,
|
||||
OutSideUnitWorkNum = OutSideUnitWorkNumSum,
|
||||
SeriousInjuriesNum = SeriousInjuriesNumSum,
|
||||
SeriousInjuriesPersonNum = SeriousInjuriesPersonNumSum,
|
||||
SeriousInjuriesLossHour = SeriousInjuriesLossHourSum,
|
||||
@@ -917,6 +927,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
ContractorNum = 0,
|
||||
SumPersonNum = 0,
|
||||
TotalWorkNum = 0,
|
||||
OutSideUnitWorkNum = 0,
|
||||
SeriousInjuriesNum = 0,
|
||||
SeriousInjuriesPersonNum = 0,
|
||||
SeriousInjuriesLossHour = 0,
|
||||
@@ -953,6 +964,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
ContractorNum = 0,
|
||||
SumPersonNum = 0,
|
||||
TotalWorkNum = 0,
|
||||
OutSideUnitWorkNum = 0,
|
||||
SeriousInjuriesNum = 0,
|
||||
SeriousInjuriesPersonNum = 0,
|
||||
SeriousInjuriesLossHour = 0,
|
||||
@@ -981,6 +993,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
|
||||
var projects = BLL.ProjectService.GetProjectWorkList();
|
||||
int i = 20;
|
||||
List<Model.InformationProject_MillionsMonthlyReport> millionsMonthlyReports = (from x in Funs.DB.InformationProject_MillionsMonthlyReport where x.Year.ToString() == year && x.Month.ToString() == months && x.States == BLL.Const.State_2 select x).ToList();
|
||||
foreach (var p in projects)
|
||||
{
|
||||
i += 10;
|
||||
@@ -1018,7 +1031,15 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
{
|
||||
item.TotalWorkNum = Math.Round(getInfo.MonthWorkTime / 10000 ?? 0, 4);
|
||||
}
|
||||
|
||||
Model.InformationProject_MillionsMonthlyReport report = millionsMonthlyReports.FirstOrDefault(x => x.ProjectId == p.ProjectId);
|
||||
if (report != null)
|
||||
{
|
||||
item.OutSideUnitWorkNum = report.OutSideUnitWorkNum;
|
||||
}
|
||||
else
|
||||
{
|
||||
item.OutSideUnitWorkNum = item.TotalWorkNum;
|
||||
}
|
||||
item.SeriousInjuriesNum = 0;
|
||||
item.SeriousInjuriesPersonNum = 0;
|
||||
item.SeriousInjuriesLossHour = 0;
|
||||
@@ -1176,6 +1197,7 @@ namespace FineUIPro.Web.ZHGL.Information
|
||||
ContractorNum = item.ContractorNum,
|
||||
SumPersonNum = item.SumPersonNum,
|
||||
TotalWorkNum = item.TotalWorkNum,
|
||||
OutSideUnitWorkNum = item.OutSideUnitWorkNum,
|
||||
SeriousInjuriesNum = item.SeriousInjuriesNum,
|
||||
SeriousInjuriesPersonNum = item.SeriousInjuriesPersonNum,
|
||||
SeriousInjuriesLossHour = item.SeriousInjuriesLossHour,
|
||||
|
||||
+9
@@ -489,6 +489,15 @@ namespace FineUIPro.Web.ZHGL.Information {
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox txtTotalWorkNum;
|
||||
|
||||
/// <summary>
|
||||
/// txtOutSideUnitWorkNum 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox txtOutSideUnitWorkNum;
|
||||
|
||||
/// <summary>
|
||||
/// txtDeathAccidentNum 控件。
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user