Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

提交代码
2024-04-26 10:39:43 +08:00 · 2024-04-26 10:39:36 +08:00
1 changed files with 3 additions and 1 deletions
@@ -18,9 +18,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.ProjectId == projectId && 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
Author	SHA1	Message	Date
gaofei	fbc54e00b2	Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN	2024-04-26 10:39:43 +08:00
gaofei	7cef012369	提交代码	2024-04-26 10:39:36 +08:00