xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

安全报表增加系统外工时统计

Browse Source
This commit is contained in:
geh
2026-01-26 17:34:39 +08:00
parent 7dff01059b
commit fd322d4c7f
25 changed files with 841 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs
+2
View File
@@ -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;
SUBQHSE/BLL/ProjectData/ProjectUnitService.cs
+2
View File
@@ -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();
}
}
SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
+65 -1
View File
@@ -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;
}
}
/// <summary>
/// UpApiMillionsMonthlyReportApi调用
/// </summary>
@@ -2535,6 +2539,12 @@
[System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<int> 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<decimal> TotalWorkNumField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<decimal> OutSideUnitWorkNumField;
[System.Runtime.Serialization.OptionalFieldAttribute()]
private System.Nullable<int> 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<decimal> 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<int> TrafficNum
{
SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportItemService.cs
+6
View File
@@ -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;