lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
夏菊
2026-07-27 15:18:35 +08:00
parent dc1dcd28e4
commit e38a472f08
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
+14 -4
View File
@@ -482,12 +482,18 @@ namespace FineUIPro.Web.ProjectData
+ (x.TrainPersonNum ?? 0) + (x.SuperTrainPersonNum ?? 0) + (x.OperativesNum ?? 0) + (x.SuperOperativesNum ?? 0) + (x.ProjectDrillPersonNum ?? 0)
}).ToList();
foreach (var pro in getProjects)
{
bool threeMonNoChange = false;
bool monNoChange = false;
bool weekNoChange = false;
bool dayNoChange = false;
string threeMonResult = "";
string monResult = "";
string dayResult = "";
string weekResult = "";
string dayResult = "";
var nowData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateNow).FirstOrDefault();
var daysData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateDays).FirstOrDefault();
var weekData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateWeek).FirstOrDefault();
@@ -497,27 +503,31 @@ namespace FineUIPro.Web.ProjectData
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == daysData.DataMetricsSum)
{
dayNoChange = true;
dayResult = "数据无变化";
}
}
if (nowData != null && weekData != null)
if (dayNoChange && nowData != null && weekData != null)
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == weekData.DataMetricsSum)
{
weekNoChange = true;
weekResult = "数据无变化";
}
}
if (nowData != null && monthData != null)
if (dayNoChange && weekNoChange && nowData != null && monthData != null)
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == monthData.DataMetricsSum)
{
monNoChange = true;
monResult = "数据无变化";
}
}
if (nowData != null && threeMonthData != null)
if (dayNoChange && weekNoChange && monNoChange && nowData != null && threeMonthData != null)
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == threeMonthData.DataMetricsSum)
{
threeMonNoChange = true;
threeMonResult = "数据无变化";
}
}