This commit is contained in:
2026-01-24 15:01:27 +08:00
parent a5a8b130e5
commit eaec543bf7
24 changed files with 327 additions and 50 deletions
@@ -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,