20211011 考勤限制业主监理推送

2021-10-11 09:10:19 +08:00
parent a7934da88a
commit f1c846da8a
14 changed files with 66 additions and 21 deletions
@@ -1249,12 +1249,14 @@ namespace BLL
                               join v in Funs.DB.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId
                               join r in Funs.DB.RealName_CollTeam on v.TeamId equals r.TeamId
                               join z in Funs.DB.RealName_Project on x.ProCode equals z.ProCode
+                               join pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
                               where x.IdcardNumber != null && x.IdcardType != null && x.ChangeTime.HasValue
                               && (proCode == null || x.ProCode == proCode) && p.HeadImage != null && p.HeadImage.Length > 0
                               && v.TeamId.HasValue && p.HeadImage != null && r.TeamId.HasValue
                               && p.IsCardNoOK ==true && z.JTproCode != null
                               && (!p.OutTime.HasValue || p.OutTime > x.ChangeTime)
                                && !x.RealNamePushTime.HasValue
+                                  && pu.UnitType != Const.ProjectUnitType_3 && pu.UnitType != Const.ProjectUnitType_4
                               orderby x.ChangeTime descending
                               select new
                               {