From eaec543bf784dc4f0a66a200f91b4fc16c26e9d8 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Sat, 24 Jan 2026 15:01:27 +0800 Subject: [PATCH] 1 --- ...V2026-01-22-gf(安全报表增加系统外工时统计).sql | 6 ++ .../ProjectMillionsMonthlyReportService.cs | 9 +- SGGL/BLL/ProjectData/ProjectUnitService.cs | 2 + SGGL/BLL/WebService/CNCECHSSEWebService.cs | 61 +++++++++++++ .../MillionsMonthlyReportItemService.cs | 2 + .../MillionsMonthlyReport.aspx | 9 ++ .../MillionsMonthlyReport.aspx.cs | 1 + .../MillionsMonthlyReportEdit.aspx | 4 +- .../MillionsMonthlyReportEdit.aspx.cs | 23 ++++- ...MillionsMonthlyReportEdit.aspx.designer.cs | 9 ++ .../MillionsMonthlyReportView.aspx | 4 +- .../MillionsMonthlyReportView.aspx.cs | 4 + ...MillionsMonthlyReportView.aspx.designer.cs | 9 ++ .../ProjectData/ProjectUnit.aspx | 3 + .../ProjectData/ProjectUnit.aspx.cs | 2 +- .../ProjectData/ProjectUnitSave.aspx | 1 + .../ProjectData/ProjectUnitSave.aspx.cs | 13 ++- .../ProjectUnitSave.aspx.designer.cs | 89 ++++++++++--------- .../Information/MillionsMonthlyReport.aspx | 3 + .../Information/MillionsMonthlyReport.aspx.cs | 1 + .../MillionsMonthlyReportSave.aspx | 15 ++++ .../MillionsMonthlyReportSave.aspx.cs | 26 +++++- ...MillionsMonthlyReportSave.aspx.designer.cs | 9 ++ SGGL/Model/Model.cs | 72 +++++++++++++++ 24 files changed, 327 insertions(+), 50 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2026-01-22-gf(安全报表增加系统外工时统计).sql diff --git a/DataBase/版本日志/SGGLDB_V2026-01-22-gf(安全报表增加系统外工时统计).sql b/DataBase/版本日志/SGGLDB_V2026-01-22-gf(安全报表增加系统外工时统计).sql new file mode 100644 index 00000000..33b6998c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-01-22-gf(安全报表增加系统外工时统计).sql @@ -0,0 +1,6 @@ +alter table Project_ProjectUnit add IsOutSideUnit bit null +GO +alter table InformationProject_MillionsMonthlyReport add OutSideUnitWorkNum decimal(18,4) null +GO +alter table Information_MillionsMonthlyReportItem add OutSideUnitWorkNum decimal(18,4) null +GO \ No newline at end of file diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs index d68e4e29..d5e55152 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs @@ -1,4 +1,7 @@ -using System.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; namespace BLL { @@ -7,7 +10,7 @@ namespace BLL /// public static class ProjectMillionsMonthlyReportService { - + public static Model.SGGLDB db = Funs.DB; /// /// 根据主键获取企业安全数据统计月报 @@ -42,6 +45,7 @@ namespace BLL ContractorNum = millionsMonthlyReport.ContractorNum, SumPersonNum = millionsMonthlyReport.SumPersonNum, TotalWorkNum = millionsMonthlyReport.TotalWorkNum, + OutSideUnitWorkNum = millionsMonthlyReport.OutSideUnitWorkNum, DeathAccidentNum = millionsMonthlyReport.DeathAccidentNum, DeathAccidentPersonNum = millionsMonthlyReport.DeathAccidentPersonNum, DeathAccidentLossHour = millionsMonthlyReport.DeathAccidentLossHour, @@ -112,6 +116,7 @@ namespace BLL newMillionsMonthlyReport.ContractorNum = millionsMonthlyReport.ContractorNum; newMillionsMonthlyReport.SumPersonNum = millionsMonthlyReport.SumPersonNum; newMillionsMonthlyReport.TotalWorkNum = millionsMonthlyReport.TotalWorkNum; + newMillionsMonthlyReport.OutSideUnitWorkNum = millionsMonthlyReport.OutSideUnitWorkNum; newMillionsMonthlyReport.DeathAccidentNum = millionsMonthlyReport.DeathAccidentNum; newMillionsMonthlyReport.DeathAccidentPersonNum = millionsMonthlyReport.DeathAccidentPersonNum; newMillionsMonthlyReport.DeathAccidentLossHour = millionsMonthlyReport.DeathAccidentLossHour; diff --git a/SGGL/BLL/ProjectData/ProjectUnitService.cs b/SGGL/BLL/ProjectData/ProjectUnitService.cs index d1d9cbd6..9620d275 100644 --- a/SGGL/BLL/ProjectData/ProjectUnitService.cs +++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs @@ -77,6 +77,7 @@ ContractRange = projectUnit.ContractRange, RealNamePushTime = projectUnit.RealNamePushTime, IsSynchro = projectUnit.IsSynchro, + IsOutSideUnit = projectUnit.IsOutSideUnit, }; db.Project_ProjectUnit.InsertOnSubmit(newProjectUnit); db.SubmitChanges(); @@ -100,6 +101,7 @@ newProjectUnit.ContractRange = projectUnit.ContractRange; newProjectUnit.RealNamePushTime = projectUnit.RealNamePushTime; newProjectUnit.IsSynchro = projectUnit.IsSynchro; + newProjectUnit.IsOutSideUnit = projectUnit.IsOutSideUnit; db.SubmitChanges(); } } diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs index 101cea76..1f381a93 100644 --- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs @@ -135,6 +135,7 @@ ContractorNum = x.ContractorNum, SumPersonNum = x.SumPersonNum, TotalWorkNum = x.TotalWorkNum, + OutSideUnitWorkNum = x.OutSideUnitWorkNum, SeriousInjuriesNum = x.SeriousInjuriesNum, SeriousInjuriesPersonNum = x.SeriousInjuriesPersonNum, SeriousInjuriesLossHour = x.SeriousInjuriesLossHour, @@ -2753,6 +2754,12 @@ [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable MedicalTreatmentPersonNumField; + [System.Runtime.Serialization.OptionalFieldAttribute()] + private string UnitIdField; + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private string ProjectIdField; + [System.Runtime.Serialization.OptionalFieldAttribute()] private string MillionsMonthlyReportIdField; @@ -2816,6 +2823,9 @@ [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable TotalWorkNumField; + [System.Runtime.Serialization.OptionalFieldAttribute()] + private System.Nullable OutSideUnitWorkNumField; + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable TrafficNumField; @@ -3002,6 +3012,40 @@ } } + [System.Runtime.Serialization.DataMemberAttribute()] + public string UnitId + { + get + { + return this.UnitIdField; + } + set + { + if ((object.ReferenceEquals(this.UnitIdField, value) != true)) + { + this.UnitIdField = value; + this.RaisePropertyChanged("UnitId"); + } + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string ProjectId + { + get + { + return this.ProjectIdField; + } + set + { + if ((object.ReferenceEquals(this.ProjectIdField, value) != true)) + { + this.ProjectIdField = value; + this.RaisePropertyChanged("ProjectId"); + } + } + } + [System.Runtime.Serialization.DataMemberAttribute()] public string MillionsMonthlyReportId { @@ -3359,6 +3403,23 @@ } } + [System.Runtime.Serialization.DataMemberAttribute()] + public System.Nullable OutSideUnitWorkNum + { + get + { + return this.OutSideUnitWorkNumField; + } + set + { + if ((this.OutSideUnitWorkNumField.Equals(value) != true)) + { + this.OutSideUnitWorkNumField = value; + this.RaisePropertyChanged("OutSideUnitWorkNum"); + } + } + } + [System.Runtime.Serialization.DataMemberAttribute()] public System.Nullable TrafficNum { diff --git a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs index 2da2d794..e9358459 100644 --- a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs +++ b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs @@ -109,6 +109,7 @@ namespace BLL ContractorNum = MillionsMonthlyReportItem.ContractorNum, SumPersonNum = MillionsMonthlyReportItem.SumPersonNum, TotalWorkNum = MillionsMonthlyReportItem.TotalWorkNum, + OutSideUnitWorkNum = MillionsMonthlyReportItem.OutSideUnitWorkNum, DeathAccidentNum = MillionsMonthlyReportItem.DeathAccidentNum, DeathAccidentPersonNum = MillionsMonthlyReportItem.DeathAccidentPersonNum, DeathAccidentLossHour = MillionsMonthlyReportItem.DeathAccidentLossHour, @@ -156,6 +157,7 @@ namespace BLL newMillionsMonthlyReportItem.ContractorNum = MillionsMonthlyReportItem.ContractorNum; newMillionsMonthlyReportItem.SumPersonNum = MillionsMonthlyReportItem.SumPersonNum; newMillionsMonthlyReportItem.TotalWorkNum = MillionsMonthlyReportItem.TotalWorkNum; + newMillionsMonthlyReportItem.OutSideUnitWorkNum = MillionsMonthlyReportItem.OutSideUnitWorkNum; newMillionsMonthlyReportItem.DeathAccidentNum = MillionsMonthlyReportItem.DeathAccidentNum; newMillionsMonthlyReportItem.DeathAccidentPersonNum = MillionsMonthlyReportItem.DeathAccidentPersonNum; newMillionsMonthlyReportItem.DeathAccidentLossHour = MillionsMonthlyReportItem.DeathAccidentLossHour; diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx index 7eefa8b2..2e9af0fe 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx @@ -6,6 +6,12 @@ 企业安全数据统计月报 +
@@ -67,6 +73,9 @@ + + diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs index d486bf72..a2fadcce 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs @@ -77,6 +77,7 @@ namespace FineUIPro.Web.InformationProject + @"MillionsMonthlyReport.ContractorNum," + @"MillionsMonthlyReport.SumPersonNum," + @"MillionsMonthlyReport.TotalWorkNum," + + @"MillionsMonthlyReport.OutSideUnitWorkNum," + @"MillionsMonthlyReport.DeathAccidentNum," + @"MillionsMonthlyReport.DeathAccidentPersonNum," + @"MillionsMonthlyReport.DeathAccidentLossHour," diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx index 5ac9d7e3..939595ea 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx @@ -24,7 +24,7 @@ - + @@ -37,6 +37,8 @@ --%> + + <%-- diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs index 1a2d3a9e..be08f3d2 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs @@ -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 outSideUnitIds = new List(); + 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 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 diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.designer.cs index 2fbc0e1a..cb477cf7 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.designer.cs @@ -84,6 +84,15 @@ namespace FineUIPro.Web.InformationProject { /// protected global::FineUIPro.TextBox txtTotalWorkNum; + /// + /// txtOutSideUnitWorkNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOutSideUnitWorkNum; + /// /// GroupPanel1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx index 5e7bedd4..968a6981 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx @@ -24,7 +24,7 @@ - + @@ -32,6 +32,8 @@ + + <%-- diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.cs index 4270b0ab..855373d3 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.cs @@ -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); diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.designer.cs index 3b64cc97..b49949f8 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.designer.cs @@ -84,6 +84,15 @@ namespace FineUIPro.Web.InformationProject { /// protected global::FineUIPro.TextBox txtTotalWorkNum; + /// + /// txtOutSideUnitWorkNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOutSideUnitWorkNum; + /// /// GroupPanel1 控件。 /// diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx index 6e531d2d..c1524849 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx @@ -82,6 +82,9 @@ + + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs index dd07620f..44d75cbe 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs @@ -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 " diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx index 69bced04..46704251 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx @@ -71,6 +71,7 @@ + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs index c6918d53..cf0ead69 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs @@ -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) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs index 050b1ab7..06fe9395 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.ProjectData -{ - - - public partial class ProjectUnitSave - { - +namespace FineUIPro.Web.ProjectData { + + + public partial class ProjectUnitSave { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// lbProjectName 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbProjectName; - + /// /// lbUnitName 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbUnitName; - + /// /// drpUnitType 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitType; - + /// /// txtCollCropCode 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCollCropCode; - + /// /// txtLinkName 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtLinkName; - + /// /// drpIdcardType 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpIdcardType; - + /// /// txtIdcardNumber 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtIdcardNumber; - + /// /// txtLinkMobile 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtLinkMobile; - + /// /// rblIsChina 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsChina; - + /// /// rblCollCropStatus 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblCollCropStatus; - + /// /// txtInTime 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtInTime; - + /// /// txtOutTime 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtOutTime; - + /// /// ckIsSynchro 控件。 /// @@ -157,7 +155,16 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckIsSynchro; - + + /// + /// ckIsOutSideUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckIsOutSideUnit; + /// /// nbPlanCostA 控件。 /// @@ -166,7 +173,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox nbPlanCostA; - + /// /// nbPlanCostB 控件。 /// @@ -175,7 +182,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox nbPlanCostB; - + /// /// txtContractRange 控件。 /// @@ -184,7 +191,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtContractRange; - + /// /// tr0 控件。 /// @@ -193,7 +200,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow tr0; - + /// /// hdProjectUnitItemId 控件。 /// @@ -202,7 +209,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label hdProjectUnitItemId; - + /// /// txtContractNum 控件。 /// @@ -211,7 +218,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtContractNum; - + /// /// txtTotalMoney 控件。 /// @@ -220,7 +227,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtTotalMoney; - + /// /// txtHSEMoney 控件。 /// @@ -229,7 +236,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtHSEMoney; - + /// /// Grid1 控件。 /// @@ -238,7 +245,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -247,7 +254,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// ToolbarFill1 控件。 /// @@ -256,7 +263,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnAdd 控件。 /// @@ -265,7 +272,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAdd; - + /// /// btnItemSave 控件。 /// @@ -274,7 +281,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnItemSave; - + /// /// Toolbar1 控件。 /// @@ -283,7 +290,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnSave 控件。 /// @@ -292,7 +299,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnClose 控件。 /// @@ -301,7 +308,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// Menu1 控件。 /// @@ -310,7 +317,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -319,7 +326,7 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx index 8b4822c9..2c48827c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx @@ -162,6 +162,9 @@ + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs index 675213e2..d4ae11a6 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx.cs @@ -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); diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx index bbcc04b7..b2fd539f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx @@ -12,6 +12,11 @@ white-space: normal; word-break: break-all; } + + .f-grid-colheader-text { + white-space: normal; + word-break: break-all; + } @@ -270,6 +275,16 @@ + + + <%-- + --%> + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs index 66fa0063..405bad33 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs @@ -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("OutSideUnitWorkNum"); + OutSideUnitWorkNumSum += values.Value("OutSideUnitWorkNum"); + } + else + { + item.OutSideUnitWorkNum = 0; + } if (!string.IsNullOrEmpty(values["SeriousInjuriesNum"].ToString())) { item.SeriousInjuriesNum = values.Value("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 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, diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs index 7fea4761..61e0fe78 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs @@ -489,6 +489,15 @@ namespace FineUIPro.Web.ZHGL.Information { /// protected global::FineUIPro.NumberBox txtTotalWorkNum; + /// + /// txtOutSideUnitWorkNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtOutSideUnitWorkNum; + /// /// txtDeathAccidentNum 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index da2b2508..a5658a95 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -126543,6 +126543,8 @@ namespace Model private System.Nullable _EnvironmenNum; + private System.Nullable _OutSideUnitWorkNum; + private EntityRef _Information_MillionsMonthlyReport; #region 可扩展性方法定义 @@ -126621,6 +126623,8 @@ namespace Model partial void OnDeathAccidentLossHourChanged(); partial void OnEnvironmenNumChanging(System.Nullable value); partial void OnEnvironmenNumChanged(); + partial void OnOutSideUnitWorkNumChanging(System.Nullable value); + partial void OnOutSideUnitWorkNumChanged(); #endregion public Information_MillionsMonthlyReportItem() @@ -127353,6 +127357,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSideUnitWorkNum", DbType="Decimal(18,4)")] + public System.Nullable OutSideUnitWorkNum + { + get + { + return this._OutSideUnitWorkNum; + } + set + { + if ((this._OutSideUnitWorkNum != value)) + { + this.OnOutSideUnitWorkNumChanging(value); + this.SendPropertyChanging(); + this._OutSideUnitWorkNum = value; + this.SendPropertyChanged("OutSideUnitWorkNum"); + this.OnOutSideUnitWorkNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_MillionsMonthlyReportItem_Information_MillionsMonthlyReport", Storage="_Information_MillionsMonthlyReport", ThisKey="MillionsMonthlyReportId", OtherKey="MillionsMonthlyReportId", IsForeignKey=true)] public Information_MillionsMonthlyReport Information_MillionsMonthlyReport { @@ -137569,6 +137593,8 @@ namespace Model private System.Nullable _SoleDutyNum; + private System.Nullable _OutSideUnitWorkNum; + private EntityRef _Base_Project; private EntityRef _Person_Persons; @@ -137689,6 +137715,8 @@ namespace Model partial void OnCommissionerNumChanged(); partial void OnSoleDutyNumChanging(System.Nullable value); partial void OnSoleDutyNumChanged(); + partial void OnOutSideUnitWorkNumChanging(System.Nullable value); + partial void OnOutSideUnitWorkNumChanged(); #endregion public InformationProject_MillionsMonthlyReport() @@ -138826,6 +138854,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutSideUnitWorkNum", DbType="Decimal(18,4)")] + public System.Nullable OutSideUnitWorkNum + { + get + { + return this._OutSideUnitWorkNum; + } + set + { + if ((this._OutSideUnitWorkNum != value)) + { + this.OnOutSideUnitWorkNumChanging(value); + this.SendPropertyChanging(); + this._OutSideUnitWorkNum = value; + this.SendPropertyChanged("OutSideUnitWorkNum"); + this.OnOutSideUnitWorkNumChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_InformationProject_MillionsMonthlyReport_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -211874,6 +211922,8 @@ namespace Model private string _QRCodeAttachUrl; + private System.Nullable _IsOutSideUnit; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -211912,6 +211962,8 @@ namespace Model partial void OnCQMS_OrganizationPicChanged(); partial void OnQRCodeAttachUrlChanging(string value); partial void OnQRCodeAttachUrlChanged(); + partial void OnIsOutSideUnitChanging(System.Nullable value); + partial void OnIsOutSideUnitChanged(); #endregion public Project_ProjectUnit() @@ -212229,6 +212281,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOutSideUnit", DbType="Bit")] + public System.Nullable IsOutSideUnit + { + get + { + return this._IsOutSideUnit; + } + set + { + if ((this._IsOutSideUnit != value)) + { + this.OnIsOutSideUnitChanging(value); + this.SendPropertyChanging(); + this._IsOutSideUnit = value; + this.SendPropertyChanged("IsOutSideUnit"); + this.OnIsOutSideUnitChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Project_ProjectUnit_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project {