From a63b942dddd5645503374ba68b84259c9707072d Mon Sep 17 00:00:00 2001
From: ZONES <765289303@qq.com>
Date: Wed, 28 May 2025 14:49:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E5=8A=B3?=
 =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/common/main3.aspx.cs       | 18 +-----------------
 SGGL/FineUIPro.Web/common/mainProject.aspx.cs | 18 +-----------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/SGGL/FineUIPro.Web/common/main3.aspx.cs b/SGGL/FineUIPro.Web/common/main3.aspx.cs
index ac99a40..ba77c56 100644
--- a/SGGL/FineUIPro.Web/common/main3.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main3.aspx.cs
@@ -87,23 +87,7 @@ namespace FineUIPro.Web.common
             DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
             DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
 
-            var m_count = Funs.DB.Meeting_ClassMeeting
-            .Where(mc => mc.ClassMeetingDate >= startd &&
-                         mc.ClassMeetingDate <= endd)
-            .GroupBy(mc => new
-            {
-                MeetingDate = mc.ClassMeetingDate.Value.Date,
-                mc.ProjectId
-            })
-            .Select(g => new
-            {
-                MeetingDate = g.Key.MeetingDate,
-                ProjectId = g.Key.ProjectId,
-                DailyMaxManagePersonNum = g.Max(mc => mc.ManagePersonNum ?? 0)
-            })
-            .OrderBy(r => r.MeetingDate)
-            .ThenBy(r => r.ProjectId)
-            .ToList().Sum(x => x.DailyMaxManagePersonNum);
+            var m_count = Funs.DB.Project_ProjectUser.Count();
             var job_count = (from x in Funs.DB.Meeting_ClassMeeting
                              where x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
                              select new Model.MeetingItem
diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
index 8a714a1..3d1dd67 100644
--- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs
@@ -87,23 +87,7 @@ namespace FineUIPro.Web.common
             DateTime startd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", startdate, "00:00:00"));
             DateTime endd = Funs.GetNewDateTimeOrNow(string.Format("{0} {1}", enddate, "23:59:59"));
 
-            var m_count = Funs.DB.Meeting_ClassMeeting
-            .Where(mc => mc.ProjectId == ProjectId && mc.ClassMeetingDate >= startd &&
-                         mc.ClassMeetingDate <= endd)
-            .GroupBy(mc => new
-            {
-                MeetingDate = mc.ClassMeetingDate.Value.Date,
-                mc.ProjectId
-            })
-            .Select(g => new
-            {
-                MeetingDate = g.Key.MeetingDate,
-                ProjectId = g.Key.ProjectId,
-                DailyMaxManagePersonNum = g.Max(mc => mc.ManagePersonNum ?? 0)
-            })
-            .OrderBy(r => r.MeetingDate)
-            .ThenBy(r => r.ProjectId)
-            .ToList().Sum(x => x.DailyMaxManagePersonNum);
+            var m_count = Funs.DB.Project_ProjectUser.Where(x => x.ProjectId == ProjectId).Count();
             var job_count = (from x in Funs.DB.Meeting_ClassMeeting
                              where x.ProjectId == ProjectId && x.ClassMeetingDate >= startd && x.ClassMeetingDate <= endd
                              select new Model.MeetingItem