From 6ca0a319b1d621674da45e85cc034d63b69b6a70 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Thu, 24 Oct 2024 16:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8=E6=9C=88?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HSSE/Manager/ManagerMonthCEdit.aspx.cs          | 13 ++++++++-----
 SGGL/FineUIPro.Web/Web.config                       |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
index 8e5db146..f3fa70ed 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
@@ -1801,7 +1801,11 @@ namespace FineUIPro.Web.HSSE.Manager
             int totalSumOutPersonNum = 0;//外聘
             int totalHSEPersonNum = 0;
             var spckList = db.SitePerson_Checking.Where(x => x.IntoOutTime >= startTime
-                      && x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1");
+                      && x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1").Select(x=>new { 
+                         x.UnitId,
+                         x.IdentityCard
+                      });
+            
             if (units.Count() > 0)
             {
                 foreach (Model.Project_ProjectUnit u in units)
@@ -1815,12 +1819,11 @@ namespace FineUIPro.Web.HSSE.Manager
                     };
                     //本部本月人数，本年考勤人数除当前月份，取平均数
                     //年度
-                    var yearList = spckList.Where(x =>  x.UnitId == u.UnitId).ToList().Select(x => new hseDayItem()
+                    var yearList = spckList.Where(x =>  x.UnitId == u.UnitId).Select(x => new hseDayItem()
                       {
                           IdentityCard = x.IdentityCard,
-                          IntoOutTime = getShortTime(x.IntoOutTime)
-                      }).GroupBy(x => new { x.IdentityCard})
-                      .ToList();
+                          //IntoOutTime = getShortTime(x.IntoOutTime)
+                      }).GroupBy(x => new { x.IdentityCard});
 
                     personSort.SumPersonNum = yearList.Count();
 
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 9fc55c34..f50b26d3 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>