提交代码

SGGL/BLL/API/HSSE/APIPageDataService.cs

@@ -76,7 +76,7 @@ namespace BLL
         public static int getSafeWorkTime(string projectId)
         {
             Model.SGGLDB db = Funs.DB;
-           int SafeHours = 0;
+            int SafeHours = 0;
             //// 查找当前项目 最新的人工时数量记录
             int getMaxWorkHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == projectId).Max(x => x.WorkHours) ?? 0;
             var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNow
@@ -125,7 +125,7 @@ namespace BLL
                                 where x.ProjectId == projectId && x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month
                                 && x.ChangeTime.Value.Day == dateValue.Day && x.IsIn == true
                                 select x;
-                return getDayAll.Select(x=>x.PersonId).Distinct().Count(); ;
+                return getDayAll.Select(x => x.PersonId).Distinct().Count(); ;
             }
         }
         #endregion
@@ -141,9 +141,11 @@ namespace BLL
             {
                 List<Model.PageDataPersonInOutItem> getSiteInOutList = new List<Model.PageDataPersonInOutItem>();
                 var getDayAll = from x in db.SitePerson_PersonInOutNow
+                                join y in db.SitePerson_Person on x.PersonId equals y.PersonId
+                                join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId
                                 where x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month
                                 && x.ChangeTime.Value.Day == dateValue.Day
-                                select x;
+                                select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType };
                 if (getDayAll.Count() > 0)
                 {
                     var getInMaxs = from x in getDayAll