增加月工效和项目工效

2023-10-20 14:34:35 +08:00
parent 2abb426abe
commit 88c39643fa
18 changed files with 1565 additions and 113 deletions
@@ -147,11 +147,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                DateTime? endTime = startTime.HasValue ? startTime.Value.AddMonths(1) : System.DateTime.Now;

                this.tvControlItem.Nodes.Clear();
-                var persons = from x in Funs.DB.Person_Persons
+                var persons = (from x in Funs.DB.Person_Persons
                              join y in Funs.DB.ZHGL_ConstructionLog
                              on x.PersonId equals y.CompileMan
                              where y.ProjectId == this.CurrUser.LoginProjectId && y.CompileDate >= startTime && y.CompileDate < endTime
-                              select x;
+                              select x).Distinct().ToList();
                foreach (var person in persons)
                {
                    var logs = from x in Funs.DB.ZHGL_ConstructionLog