From 7d79e35592d93931b00d87d38b9e78374fea76bc Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Mon, 27 Jul 2026 15:24:15 +0800
Subject: [PATCH] 1

---
 .../ProjectData/MasterProjectData.aspx.cs       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
index 1f1dff9..d9d3976 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
@@ -484,10 +484,15 @@ namespace FineUIPro.Web.ProjectData
 
             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 +502,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 = "数据无变化";
                     }
                 }