From fd322d4c7fe6a73f926bd0a159551c40cb99a973 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Mon, 26 Jan 2026 17:34:39 +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 +
SUBQHSE/BLL/ProjectData/ProjectUnitService.cs | 2 +
SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs | 66 ++-
.../MillionsMonthlyReportItemService.cs | 6 +
.../MillionsMonthlyReport.aspx | 453 +++++++++---------
.../MillionsMonthlyReport.aspx.cs | 16 +-
.../MillionsMonthlyReportEdit.aspx | 4 +-
.../MillionsMonthlyReportEdit.aspx.cs | 29 +-
...MillionsMonthlyReportEdit.aspx.designer.cs | 9 +
.../MillionsMonthlyReportView.aspx | 4 +-
.../MillionsMonthlyReportView.aspx.cs | 4 +
...MillionsMonthlyReportView.aspx.designer.cs | 9 +
.../ProjectData/ProjectUnit.aspx | 7 +-
.../ProjectData/ProjectUnit.aspx.cs | 49 +-
.../ProjectData/ProjectUnit.aspx.designer.cs | 4 +-
.../ProjectData/ProjectUnitSave.aspx | 1 +
.../ProjectData/ProjectUnitSave.aspx.cs | 20 +-
.../ProjectUnitSave.aspx.designer.cs | 9 +
.../Information/MillionsMonthlyReport.aspx | 3 +
.../Information/MillionsMonthlyReport.aspx.cs | 1 +
.../MillionsMonthlyReportSave.aspx | 92 +++-
.../MillionsMonthlyReportSave.aspx.cs | 214 +++++++--
...MillionsMonthlyReportSave.aspx.designer.cs | 17 +-
SUBQHSE/Model/Model.cs | 120 +++++
25 files changed, 841 insertions(+), 306 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 0000000..33b6998
--- /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/SUBQHSE/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs b/SUBQHSE/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs
index 4cd116d..1de7e49 100644
--- a/SUBQHSE/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs
+++ b/SUBQHSE/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/SUBQHSE/BLL/ProjectData/ProjectUnitService.cs b/SUBQHSE/BLL/ProjectData/ProjectUnitService.cs
index 27bb621..a9d6125 100644
--- a/SUBQHSE/BLL/ProjectData/ProjectUnitService.cs
+++ b/SUBQHSE/BLL/ProjectData/ProjectUnitService.cs
@@ -79,6 +79,7 @@
ContractRange = projectUnit.ContractRange,
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/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
index d018417..ff53c17 100644
--- a/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
@@ -163,7 +163,7 @@
UnitId = x.UnitId,
Year = x.Year,
Month = x.Month,
- FillingMan = x.FillingMan+"|"+(x.KeyWorkNum??0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
+ FillingMan = x.FillingMan + "|" + (x.KeyWorkNum ?? 0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
FillingDate = x.FillingDate,
DutyPerson = x.DutyPerson,
RecordableIncidentRate = x.RecordableIncidentRate,
@@ -203,6 +203,7 @@
ContractorNum = x.ContractorNum,
SumPersonNum = x.SumPersonNum,
TotalWorkNum = x.TotalWorkNum,
+ OutSideUnitWorkNum = x.OutSideUnitWorkNum,
SeriousInjuriesNum = x.SeriousInjuriesNum,
SeriousInjuriesPersonNum = x.SeriousInjuriesPersonNum,
SeriousInjuriesLossHour = x.SeriousInjuriesLossHour,
@@ -225,6 +226,8 @@
FirstAidDressingsNum = x.FirstAidDressingsNum,
AttemptedEventNum = x.AttemptedEventNum,
LossDayNum = x.LossDayNum,
+ UnitId = x.UnitId,
+ ProjectId = x.ProjectId,
};
//老接口Serveice
@@ -261,6 +264,7 @@
return code;
}
}
+
///
/// UpApiMillionsMonthlyReportApi调用
///
@@ -2535,6 +2539,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;
@@ -2598,6 +2608,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;
@@ -2784,6 +2797,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
{
@@ -3141,6 +3188,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/SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs b/SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs
index 2da2d79..9bae4e7 100644
--- a/SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs
+++ b/SUBQHSE/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/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx
index e495c86..93bfda5 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx
@@ -1,6 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MillionsMonthlyReport.aspx.cs"
Inherits="FineUIPro.Web.InformationProject.MillionsMonthlyReport" %>
-
<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
@@ -8,233 +7,243 @@
企业安全数据统计月报
+