修改安全月报

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();