From 72edf7900ee23689759dee741e5b094a8968e171 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sat, 24 Jan 2026 15:11:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8A=A5=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=B3=BB=E7=BB=9F=E5=A4=96=E5=B7=A5=E6=97=B6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...V2026-01-22-gf(安全报表增加系统外工时统计).sql | 6 + .../ProjectMillionsMonthlyReportService.cs | 2 + SGGL/BLL/ProjectData/ProjectUnitService.cs | 4 +- .../CNCECHSSEService/Reference.cs | 600 ++++++++++++------ SGGL/BLL/WebService/CNCECHSSEWebService.cs | 1 + .../MillionsMonthlyReportItemService.cs | 6 + .../MillionsMonthlyReport.aspx | 426 +++++++------ .../MillionsMonthlyReport.aspx.cs | 35 +- .../MillionsMonthlyReport.aspx.designer.cs | 82 ++- .../MillionsMonthlyReportEdit.aspx | 4 +- .../MillionsMonthlyReportEdit.aspx.cs | 33 +- ...MillionsMonthlyReportEdit.aspx.designer.cs | 9 + .../MillionsMonthlyReportView.aspx | 4 +- .../MillionsMonthlyReportView.aspx.cs | 4 + ...MillionsMonthlyReportView.aspx.designer.cs | 9 + .../ProjectData/ProjectUnit.aspx | 192 +++--- .../ProjectData/ProjectUnit.aspx.cs | 2 +- .../ProjectData/ProjectUnitSave.aspx | 188 +++--- .../ProjectData/ProjectUnitSave.aspx.cs | 12 + .../ProjectUnitSave.aspx.designer.cs | 63 +- .../Information/MillionsMonthlyReport.aspx | 3 + .../Information/MillionsMonthlyReport.aspx.cs | 1 + .../MillionsMonthlyReportSave.aspx | 92 ++- .../MillionsMonthlyReportSave.aspx.cs | 210 ++++-- ...MillionsMonthlyReportSave.aspx.designer.cs | 17 +- SGGL/Model/Model.cs | 80 ++- 26 files changed, 1377 insertions(+), 708 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2026-01-22-gf(安全报表增加系统外工时统计).sql diff --git a/DataBase/版本日志/SUBQHSE_V2026-01-22-gf(安全报表增加系统外工时统计).sql b/DataBase/版本日志/SUBQHSE_V2026-01-22-gf(安全报表增加系统外工时统计).sql new file mode 100644 index 00000000..33b6998c --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_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 71110758..d5e55152 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs @@ -45,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, @@ -115,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 3265c145..c1f3a705 100644 --- a/SGGL/BLL/ProjectData/ProjectUnitService.cs +++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs @@ -77,8 +77,9 @@ PlanCostA = projectUnit.PlanCostA, PlanCostB = projectUnit.PlanCostB, ContractRange = projectUnit.ContractRange, - RealNamePushTime= projectUnit.RealNamePushTime, + RealNamePushTime = projectUnit.RealNamePushTime, IsSynchro = projectUnit.IsSynchro, + IsOutSideUnit = projectUnit.IsOutSideUnit, }; db.Project_ProjectUnit.InsertOnSubmit(newProjectUnit); db.SubmitChanges(); @@ -102,6 +103,7 @@ newProjectUnit.ContractRange = projectUnit.ContractRange; newProjectUnit.RealNamePushTime = projectUnit.RealNamePushTime; newProjectUnit.IsSynchro = projectUnit.IsSynchro; + newProjectUnit.IsOutSideUnit = projectUnit.IsOutSideUnit; db.SubmitChanges(); } } diff --git a/SGGL/BLL/Service References/CNCECHSSEService/Reference.cs b/SGGL/BLL/Service References/CNCECHSSEService/Reference.cs index 5ba5f9f7..07728adb 100644 --- a/SGGL/BLL/Service References/CNCECHSSEService/Reference.cs +++ b/SGGL/BLL/Service References/CNCECHSSEService/Reference.cs @@ -11219,543 +11219,737 @@ namespace BLL.CNCECHSSEService { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] [System.Runtime.Serialization.DataContractAttribute(Name="Information_MillionsMonthlyReportItem", Namespace="http://schemas.datacontract.org/2004/07/BLL.OpenService")] [System.SerializableAttribute()] - public partial class Information_MillionsMonthlyReportItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - + public partial class Information_MillionsMonthlyReportItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + { + [System.NonSerializedAttribute()] private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private string AffiliationField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable AttemptedEventNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable ContractorNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable EquipmentNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable ExplosionNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable FireNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable FirstAidDressingsNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable LossDayNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable MedicalTreatmentLossHourField; - + [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; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private string MillionsMonthlyReportItemIdField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable MinorAccidentLossHourField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable MinorAccidentNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable MinorAccidentPersonNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private string NameField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable OtherAccidentLossHourField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable OtherAccidentNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable OtherAccidentPersonNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable OtherNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable PostPersonNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable QualityNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable RestrictedWorkLossHourField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable RestrictedWorkPersonNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable SeriousInjuriesLossHourField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable SeriousInjuriesNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable SeriousInjuriesPersonNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable SnapPersonNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable SortIndexField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable SumPersonNumField; - + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable TotalWorkNumField; - + + [System.Runtime.Serialization.OptionalFieldAttribute()] + private System.Nullable OutSideUnitWorkNumField; + [System.Runtime.Serialization.OptionalFieldAttribute()] private System.Nullable TrafficNumField; - + [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { + public System.Runtime.Serialization.ExtensionDataObject ExtensionData + { + get + { return this.extensionDataField; } - set { + set + { this.extensionDataField = value; } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public string Affiliation { - get { + public string Affiliation + { + get + { return this.AffiliationField; } - set { - if ((object.ReferenceEquals(this.AffiliationField, value) != true)) { + set + { + if ((object.ReferenceEquals(this.AffiliationField, value) != true)) + { this.AffiliationField = value; this.RaisePropertyChanged("Affiliation"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable AttemptedEventNum { - get { + public System.Nullable AttemptedEventNum + { + get + { return this.AttemptedEventNumField; } - set { - if ((this.AttemptedEventNumField.Equals(value) != true)) { + set + { + if ((this.AttemptedEventNumField.Equals(value) != true)) + { this.AttemptedEventNumField = value; this.RaisePropertyChanged("AttemptedEventNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable ContractorNum { - get { + public System.Nullable ContractorNum + { + get + { return this.ContractorNumField; } - set { - if ((this.ContractorNumField.Equals(value) != true)) { + set + { + if ((this.ContractorNumField.Equals(value) != true)) + { this.ContractorNumField = value; this.RaisePropertyChanged("ContractorNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable EquipmentNum { - get { + public System.Nullable EquipmentNum + { + get + { return this.EquipmentNumField; } - set { - if ((this.EquipmentNumField.Equals(value) != true)) { + set + { + if ((this.EquipmentNumField.Equals(value) != true)) + { this.EquipmentNumField = value; this.RaisePropertyChanged("EquipmentNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable ExplosionNum { - get { + public System.Nullable ExplosionNum + { + get + { return this.ExplosionNumField; } - set { - if ((this.ExplosionNumField.Equals(value) != true)) { + set + { + if ((this.ExplosionNumField.Equals(value) != true)) + { this.ExplosionNumField = value; this.RaisePropertyChanged("ExplosionNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable FireNum { - get { + public System.Nullable FireNum + { + get + { return this.FireNumField; } - set { - if ((this.FireNumField.Equals(value) != true)) { + set + { + if ((this.FireNumField.Equals(value) != true)) + { this.FireNumField = value; this.RaisePropertyChanged("FireNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable FirstAidDressingsNum { - get { + public System.Nullable FirstAidDressingsNum + { + get + { return this.FirstAidDressingsNumField; } - set { - if ((this.FirstAidDressingsNumField.Equals(value) != true)) { + set + { + if ((this.FirstAidDressingsNumField.Equals(value) != true)) + { this.FirstAidDressingsNumField = value; this.RaisePropertyChanged("FirstAidDressingsNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable LossDayNum { - get { + public System.Nullable LossDayNum + { + get + { return this.LossDayNumField; } - set { - if ((this.LossDayNumField.Equals(value) != true)) { + set + { + if ((this.LossDayNumField.Equals(value) != true)) + { this.LossDayNumField = value; this.RaisePropertyChanged("LossDayNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable MedicalTreatmentLossHour { - get { + public System.Nullable MedicalTreatmentLossHour + { + get + { return this.MedicalTreatmentLossHourField; } - set { - if ((this.MedicalTreatmentLossHourField.Equals(value) != true)) { + set + { + if ((this.MedicalTreatmentLossHourField.Equals(value) != true)) + { this.MedicalTreatmentLossHourField = value; this.RaisePropertyChanged("MedicalTreatmentLossHour"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable MedicalTreatmentPersonNum { - get { + public System.Nullable MedicalTreatmentPersonNum + { + get + { return this.MedicalTreatmentPersonNumField; } - set { - if ((this.MedicalTreatmentPersonNumField.Equals(value) != true)) { + set + { + if ((this.MedicalTreatmentPersonNumField.Equals(value) != true)) + { this.MedicalTreatmentPersonNumField = value; this.RaisePropertyChanged("MedicalTreatmentPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public string MillionsMonthlyReportId { - get { + 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 + { + get + { return this.MillionsMonthlyReportIdField; } - set { - if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true)) { + set + { + if ((object.ReferenceEquals(this.MillionsMonthlyReportIdField, value) != true)) + { this.MillionsMonthlyReportIdField = value; this.RaisePropertyChanged("MillionsMonthlyReportId"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public string MillionsMonthlyReportItemId { - get { + public string MillionsMonthlyReportItemId + { + get + { return this.MillionsMonthlyReportItemIdField; } - set { - if ((object.ReferenceEquals(this.MillionsMonthlyReportItemIdField, value) != true)) { + set + { + if ((object.ReferenceEquals(this.MillionsMonthlyReportItemIdField, value) != true)) + { this.MillionsMonthlyReportItemIdField = value; this.RaisePropertyChanged("MillionsMonthlyReportItemId"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable MinorAccidentLossHour { - get { + public System.Nullable MinorAccidentLossHour + { + get + { return this.MinorAccidentLossHourField; } - set { - if ((this.MinorAccidentLossHourField.Equals(value) != true)) { + set + { + if ((this.MinorAccidentLossHourField.Equals(value) != true)) + { this.MinorAccidentLossHourField = value; this.RaisePropertyChanged("MinorAccidentLossHour"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable MinorAccidentNum { - get { + public System.Nullable MinorAccidentNum + { + get + { return this.MinorAccidentNumField; } - set { - if ((this.MinorAccidentNumField.Equals(value) != true)) { + set + { + if ((this.MinorAccidentNumField.Equals(value) != true)) + { this.MinorAccidentNumField = value; this.RaisePropertyChanged("MinorAccidentNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable MinorAccidentPersonNum { - get { + public System.Nullable MinorAccidentPersonNum + { + get + { return this.MinorAccidentPersonNumField; } - set { - if ((this.MinorAccidentPersonNumField.Equals(value) != true)) { + set + { + if ((this.MinorAccidentPersonNumField.Equals(value) != true)) + { this.MinorAccidentPersonNumField = value; this.RaisePropertyChanged("MinorAccidentPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public string Name { - get { + public string Name + { + get + { return this.NameField; } - set { - if ((object.ReferenceEquals(this.NameField, value) != true)) { + set + { + if ((object.ReferenceEquals(this.NameField, value) != true)) + { this.NameField = value; this.RaisePropertyChanged("Name"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable OtherAccidentLossHour { - get { + public System.Nullable OtherAccidentLossHour + { + get + { return this.OtherAccidentLossHourField; } - set { - if ((this.OtherAccidentLossHourField.Equals(value) != true)) { + set + { + if ((this.OtherAccidentLossHourField.Equals(value) != true)) + { this.OtherAccidentLossHourField = value; this.RaisePropertyChanged("OtherAccidentLossHour"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable OtherAccidentNum { - get { + public System.Nullable OtherAccidentNum + { + get + { return this.OtherAccidentNumField; } - set { - if ((this.OtherAccidentNumField.Equals(value) != true)) { + set + { + if ((this.OtherAccidentNumField.Equals(value) != true)) + { this.OtherAccidentNumField = value; this.RaisePropertyChanged("OtherAccidentNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable OtherAccidentPersonNum { - get { + public System.Nullable OtherAccidentPersonNum + { + get + { return this.OtherAccidentPersonNumField; } - set { - if ((this.OtherAccidentPersonNumField.Equals(value) != true)) { + set + { + if ((this.OtherAccidentPersonNumField.Equals(value) != true)) + { this.OtherAccidentPersonNumField = value; this.RaisePropertyChanged("OtherAccidentPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable OtherNum { - get { + public System.Nullable OtherNum + { + get + { return this.OtherNumField; } - set { - if ((this.OtherNumField.Equals(value) != true)) { + set + { + if ((this.OtherNumField.Equals(value) != true)) + { this.OtherNumField = value; this.RaisePropertyChanged("OtherNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable PostPersonNum { - get { + public System.Nullable PostPersonNum + { + get + { return this.PostPersonNumField; } - set { - if ((this.PostPersonNumField.Equals(value) != true)) { + set + { + if ((this.PostPersonNumField.Equals(value) != true)) + { this.PostPersonNumField = value; this.RaisePropertyChanged("PostPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable QualityNum { - get { + public System.Nullable QualityNum + { + get + { return this.QualityNumField; } - set { - if ((this.QualityNumField.Equals(value) != true)) { + set + { + if ((this.QualityNumField.Equals(value) != true)) + { this.QualityNumField = value; this.RaisePropertyChanged("QualityNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable RestrictedWorkLossHour { - get { + public System.Nullable RestrictedWorkLossHour + { + get + { return this.RestrictedWorkLossHourField; } - set { - if ((this.RestrictedWorkLossHourField.Equals(value) != true)) { + set + { + if ((this.RestrictedWorkLossHourField.Equals(value) != true)) + { this.RestrictedWorkLossHourField = value; this.RaisePropertyChanged("RestrictedWorkLossHour"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable RestrictedWorkPersonNum { - get { + public System.Nullable RestrictedWorkPersonNum + { + get + { return this.RestrictedWorkPersonNumField; } - set { - if ((this.RestrictedWorkPersonNumField.Equals(value) != true)) { + set + { + if ((this.RestrictedWorkPersonNumField.Equals(value) != true)) + { this.RestrictedWorkPersonNumField = value; this.RaisePropertyChanged("RestrictedWorkPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable SeriousInjuriesLossHour { - get { + public System.Nullable SeriousInjuriesLossHour + { + get + { return this.SeriousInjuriesLossHourField; } - set { - if ((this.SeriousInjuriesLossHourField.Equals(value) != true)) { + set + { + if ((this.SeriousInjuriesLossHourField.Equals(value) != true)) + { this.SeriousInjuriesLossHourField = value; this.RaisePropertyChanged("SeriousInjuriesLossHour"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable SeriousInjuriesNum { - get { + public System.Nullable SeriousInjuriesNum + { + get + { return this.SeriousInjuriesNumField; } - set { - if ((this.SeriousInjuriesNumField.Equals(value) != true)) { + set + { + if ((this.SeriousInjuriesNumField.Equals(value) != true)) + { this.SeriousInjuriesNumField = value; this.RaisePropertyChanged("SeriousInjuriesNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable SeriousInjuriesPersonNum { - get { + public System.Nullable SeriousInjuriesPersonNum + { + get + { return this.SeriousInjuriesPersonNumField; } - set { - if ((this.SeriousInjuriesPersonNumField.Equals(value) != true)) { + set + { + if ((this.SeriousInjuriesPersonNumField.Equals(value) != true)) + { this.SeriousInjuriesPersonNumField = value; this.RaisePropertyChanged("SeriousInjuriesPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable SnapPersonNum { - get { + public System.Nullable SnapPersonNum + { + get + { return this.SnapPersonNumField; } - set { - if ((this.SnapPersonNumField.Equals(value) != true)) { + set + { + if ((this.SnapPersonNumField.Equals(value) != true)) + { this.SnapPersonNumField = value; this.RaisePropertyChanged("SnapPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable SortIndex { - get { + public System.Nullable SortIndex + { + get + { return this.SortIndexField; } - set { - if ((this.SortIndexField.Equals(value) != true)) { + set + { + if ((this.SortIndexField.Equals(value) != true)) + { this.SortIndexField = value; this.RaisePropertyChanged("SortIndex"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable SumPersonNum { - get { + public System.Nullable SumPersonNum + { + get + { return this.SumPersonNumField; } - set { - if ((this.SumPersonNumField.Equals(value) != true)) { + set + { + if ((this.SumPersonNumField.Equals(value) != true)) + { this.SumPersonNumField = value; this.RaisePropertyChanged("SumPersonNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable TotalWorkNum { - get { + public System.Nullable TotalWorkNum + { + get + { return this.TotalWorkNumField; } - set { - if ((this.TotalWorkNumField.Equals(value) != true)) { + set + { + if ((this.TotalWorkNumField.Equals(value) != true)) + { this.TotalWorkNumField = value; this.RaisePropertyChanged("TotalWorkNum"); } } } - + [System.Runtime.Serialization.DataMemberAttribute()] - public System.Nullable TrafficNum { - get { + 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 + { + get + { return this.TrafficNumField; } - set { - if ((this.TrafficNumField.Equals(value) != true)) { + set + { + if ((this.TrafficNumField.Equals(value) != true)) + { this.TrafficNumField = value; this.RaisePropertyChanged("TrafficNum"); } } } - + public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { + + protected void RaisePropertyChanged(string propertyName) + { System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { + if ((propertyChanged != null)) + { propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); } } } - + [System.Diagnostics.DebuggerStepThroughAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] [System.Runtime.Serialization.DataContractAttribute(Name="Information_SafetyQuarterlyReport", Namespace="http://schemas.datacontract.org/2004/07/BLL.OpenService")] diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs index b4d8f318..6984719d 100644 --- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs @@ -210,6 +210,7 @@ ContractorNum = x.ContractorNum, SumPersonNum = x.SumPersonNum, TotalWorkNum = x.TotalWorkNum, + OutSideUnitWorkNum = x.OutSideUnitWorkNum, SeriousInjuriesNum = x.SeriousInjuriesNum, SeriousInjuriesPersonNum = x.SeriousInjuriesPersonNum, SeriousInjuriesLossHour = x.SeriousInjuriesLossHour, diff --git a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs index 2da2d794..1d628790 100644 --- a/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs +++ b/SGGL/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs @@ -103,12 +103,15 @@ namespace BLL MillionsMonthlyReportId = MillionsMonthlyReportItem.MillionsMonthlyReportId, SortIndex = MillionsMonthlyReportItem.SortIndex, Affiliation = MillionsMonthlyReportItem.Affiliation, + //UnitId = MillionsMonthlyReportItem.UnitId, Name = MillionsMonthlyReportItem.Name, + //ProjectId = MillionsMonthlyReportItem.ProjectId, PostPersonNum = MillionsMonthlyReportItem.PostPersonNum, SnapPersonNum = MillionsMonthlyReportItem.SnapPersonNum, ContractorNum = MillionsMonthlyReportItem.ContractorNum, SumPersonNum = MillionsMonthlyReportItem.SumPersonNum, TotalWorkNum = MillionsMonthlyReportItem.TotalWorkNum, + OutSideUnitWorkNum = MillionsMonthlyReportItem.OutSideUnitWorkNum, DeathAccidentNum = MillionsMonthlyReportItem.DeathAccidentNum, DeathAccidentPersonNum = MillionsMonthlyReportItem.DeathAccidentPersonNum, DeathAccidentLossHour = MillionsMonthlyReportItem.DeathAccidentLossHour, @@ -150,12 +153,15 @@ namespace BLL Model.Information_MillionsMonthlyReportItem newMillionsMonthlyReportItem = Funs.DB.Information_MillionsMonthlyReportItem.FirstOrDefault(e => e.MillionsMonthlyReportItemId == MillionsMonthlyReportItem.MillionsMonthlyReportItemId); newMillionsMonthlyReportItem.SortIndex = MillionsMonthlyReportItem.SortIndex; newMillionsMonthlyReportItem.Affiliation = MillionsMonthlyReportItem.Affiliation; + //newMillionsMonthlyReportItem.UnitId = MillionsMonthlyReportItem.UnitId; newMillionsMonthlyReportItem.Name = MillionsMonthlyReportItem.Name; + //newMillionsMonthlyReportItem.ProjectId = MillionsMonthlyReportItem.ProjectId; newMillionsMonthlyReportItem.PostPersonNum = MillionsMonthlyReportItem.PostPersonNum; newMillionsMonthlyReportItem.SnapPersonNum = MillionsMonthlyReportItem.SnapPersonNum; 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..fa1f277e 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx @@ -1,224 +1,250 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MillionsMonthlyReport.aspx.cs" Inherits="FineUIPro.Web.InformationProject.MillionsMonthlyReport" %> +<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %> + 企业安全数据统计月报 +
- - - - - - - - - - - - - - - - - - - - - <%-- - - - --%> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + <%-- + + + --%> + + + - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +