zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页数据只显示本年份修改

Browse Source
This commit is contained in:
李超
2024-01-03 14:12:27 +08:00
parent e8877811ef
commit f590c95d94
6 changed files with 291 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+14 -11
View File
@@ -184,7 +184,8 @@ namespace FineUIPro.Web.common
//}
var ProjectTotal1 = (from x in Funs.DB.HSSE_MonthReportItem
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId
// where ("成达公司HSE管理人数" == x.ReportItem || "分包商HSE管理人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId
where ("成达公司现场人数" == x.ReportItem ) && y.Years == DateTime.Now.Year && y.ProjectId==CurrUser.LoginProjectId
select x.YearTotal).Sum();
@@ -194,24 +195,26 @@ namespace FineUIPro.Web.common
var ProjectTotal2 = (from x in Funs.DB.HSSE_MonthReportItem
join y in Funs.DB.HSSE_MonthReport on x.MonthReportId equals y.MonthReportId
where ("成达公司现场人数" == x.ReportItem || "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == CurrUser.LoginProjectId
// where ("成达公司现场人数" == x.ReportItem || "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == CurrUser.LoginProjectId
where ( "分包商现场人数" == x.ReportItem) && y.Years == DateTime.Now.Year && y.ProjectId == CurrUser.LoginProjectId
select x.YearTotal).Sum();
if (ProjectTotal1.HasValue)
{
this.divGLPerson.InnerHtml = ProjectTotal1.Value.ToString();
this.divGLPerson.InnerHtml = ProjectTotal1.Value.ToString() + "人月";
}
if (ProjectTotal2.HasValue)
if (ProjectTotal2.HasValue&& ProjectTotal1.HasValue)
{
this.divALLPerson.InnerHtml = ProjectTotal2.Value.ToString();
this.divALLPerson.InnerHtml = (ProjectTotal1.Value + ProjectTotal2.Value).ToString() + "人月";
}
if (ProjectTotal1.HasValue && ProjectTotal2.HasValue)
{
this.divZYPerson.InnerHtml = (ProjectTotal2.Value - ProjectTotal1.Value).ToString();
}
else if(ProjectTotal2.HasValue)
//if (ProjectTotal1.HasValue && ProjectTotal2.HasValue)
//{
// this.divZYPerson.InnerHtml = (ProjectTotal2.Value - ProjectTotal1.Value).ToString();
//}
//else
if(ProjectTotal2.HasValue)
{
this.divZYPerson.InnerHtml = ProjectTotal2.Value .ToString();
this.divZYPerson.InnerHtml = ProjectTotal2.Value .ToString()+"人月";
}