lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs
+12 -13
View File
@@ -1,5 +1,4 @@
using Model;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -195,9 +194,9 @@ namespace BLL
}
var getMaxMonthReport = (from x in Funs.DB.SeDin_MonthReport
where x.ProjectId == projectId && x.ReporMonth < monthD
where x.ProjectId == projectId && x.ReporMonth < monthD
orderby x.ReporMonth descending
select x).FirstOrDefault();
select x).FirstOrDefault();
if (getMaxMonthReport != null)
{
var getMonthReport2 = Funs.DB.SeDin_MonthReport2.FirstOrDefault(x => x.MonthReportId == getMaxMonthReport.MonthReportId);
@@ -480,7 +479,7 @@ namespace BLL
///当月费用
var getCostManage = from x in db.CostGoods_CostManageItem
join y in db.CostGoods_CostManage on x.CostManageId equals y.CostManageId
where y.ProjectId ==projectId && y.CostManageDate >= startDateD && y.CostManageDate < endDateD.Value.AddDays(1)
where y.ProjectId == projectId && y.CostManageDate >= startDateD && y.CostManageDate < endDateD.Value.AddDays(1)
&& y.States == Const.State_2
select x;
if (getCostManage.Count() > 0)
@@ -521,11 +520,11 @@ namespace BLL
if (monthD >= Funs.GetNewDateTime("2023-07-01"))
{
getLists.SafetyYear += getLastMonthReport6.SafetyYear;
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
getLists.ProgressYear += getLastMonthReport6.ProgressYear;
getLists.ProgressTotal += getLastMonthReport6.ProgressTotal;
getLists.EducationYear += getLastMonthReport6.EducationYear;
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
}
else
{
@@ -540,16 +539,16 @@ namespace BLL
else
{
if (monthD >= Funs.GetNewDateTime("2023-07-01"))
{
{
getLists.SafetyTotal += getLastMonthReport6.SafetyTotal;
getLists.ProgressTotal += getLastMonthReport6.ProgressTotal;
getLists.EducationTotal += getLastMonthReport6.EducationTotal;
}
else
{
getLists.SafetyTotal += (getLastMonthReport6.SafetyTotal + getLastMonthReport6.ProgressTotal + getLastMonthReport6.EducationTotal);
{
getLists.SafetyTotal += (getLastMonthReport6.SafetyTotal + getLastMonthReport6.ProgressTotal + getLastMonthReport6.EducationTotal);
}
getLists.LaborTotal += getLastMonthReport6.LaborTotal;
getLists.SumTotal += getLastMonthReport6.SumTotal;
@@ -557,7 +556,7 @@ namespace BLL
}
}
return getLists;
return getLists;
}
}
#endregion