From 487f11b94adf02897b3cae224473d48fa3cdf954 Mon Sep 17 00:00:00 2001 From: "754998852@qq.com" <754998852@qq.com> Date: Fri, 25 Oct 2024 19:29:34 +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 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs index f3fa70ed..a5db550f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs @@ -1787,6 +1787,11 @@ namespace FineUIPro.Web.HSSE.Manager } #region 2 人力投入情况 + public class spckDtp { + public string IdentityCard { get; set; } + public string UnitId { get; set; } + } + /// /// 显示月报告人员投入情况 /// @@ -1800,10 +1805,11 @@ namespace FineUIPro.Web.HSSE.Manager int totalSumPersonNum = 0;//总部 int totalSumOutPersonNum = 0;//外聘 int totalHSEPersonNum = 0; + var unitlist = db.SitePerson_Person.Where(x => x.ProjectId == ProjectId); var spckList = db.SitePerson_Checking.Where(x => x.IntoOutTime >= startTime - && x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1").Select(x=>new { - x.UnitId, - x.IdentityCard + && x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1").Select(x=>new spckDtp{ + IdentityCard=x.IdentityCard, + UnitId= unitlist.FirstOrDefault(y=>y.IdentityCard==x.IdentityCard).UnitId }); if (units.Count() > 0)