提交代码

SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs

@@ -406,7 +406,7 @@ namespace BLL
         ///  获取出入记录人工时
         /// </summary>
         /// <returns></returns>
-        public static List<Model.WorkPostStatisticItem> getWorkPostStatistic(List<Model.SitePerson_PersonInOut> getAllPersonInOutList)
+        public static List<Model.WorkPostStatisticItem> getWorkPostStatistic(List<Model.SitePerson_PersonInOut> getAllPersonInOutList, DateTime? startTime, DateTime? endTime, string projectId)
         {
             Model.SGGLDB db = Funs.DB;
             List<Model.WorkPostStatisticItem> reports = new List<Model.WorkPostStatisticItem>();
@@ -428,7 +428,14 @@ namespace BLL
                         PersonCount = getW.Select(x => x.PersonId).Distinct().Count(),
                         UnitWorkPostID = uitem + "|" + witem,
                     };
-
+                    if (witem == BLL.Const.WorkPost_Welder)
+                    {
+                        newWItem.EngineeringQuantity = (from x in db.HJGL_WeldJoint
+                                                        join y in db.HJGL_WeldingDaily
+                                                        on x.WeldingDailyId equals y.WeldingDailyId
+                                                        where x.ProjectId == projectId && y.UnitId == uitem && y.WeldingDate >= startTime && y.WeldingDate <= endTime
+                                                        select x.Size ?? 0).ToList().Sum();
+                    }
                     reports.Add(newWItem);
                 }
             }