修改进度报表

2023-06-06 09:54:46 +08:00
parent 6b1271387c
commit 3cf225ea86
31 changed files with 1582 additions and 123 deletions
@@ -252,7 +252,7 @@ namespace FineUIPro.Web.common
                List<Model.SingleSerie> series = new List<Model.SingleSerie>();
                Model.BusinessColumn businessColumn = new Model.BusinessColumn();
                List<string> listCategories = new List<string>();
-                var persons = from x in db.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true select x;
+                var persons = from x in db.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now) select x;
                var posts = (from x in persons
                             join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
                             select y).Distinct();