20211011 考勤限制业主监理推送

DataBase/版本日志/SGGLDB_V2021-10-02-001.sql

@@ -0,0 +1,39 @@
+ALTER PROC [dbo].[spInOutManHoursReport]
+          @projectId NVARCHAR(50),
+		  @unitId NVARCHAR(max)= NULL,
+		  @postId NVARCHAR(max)= NULL,
+		  @startTime DATETIME = NULL,
+          @endTime DATETIME = NULL    
+AS
+/*****************µ¥Î»¿¼ÇÚ****************/
+SELECT CAST(NEWID() AS NVARCHAR(100)) AS ID
+	,T.ProjectId
+	,T.UnitId
+	,ISNULL((case when T.UnitId=''then null 
+		else (case when u.ShortUnitName IS NOT NULL THEN u.ShortUnitName ELSE u.UnitName END) end),'δ֪') AS UnitName
+	,ISNULL((case when T.UnitId=''then null 
+		else u.UnitName end),'δ֪') AS AllUnitName
+	,T.PostId
+	,ISNULL((case when W.WorkPostName=''then null else W.WorkPostName end),'δ֪') AS PostName
+	,SUM(ISNULL(ManHours,0)) AS ManHoursSum
+	,COUNT(T.NewID) AS ManCountSum 
+	,(SELECT COUNT(PersonId) FROM SitePerson_Person 
+		WHERE  ProjectId = T.ProjectId AND T.UnitId=UnitId AND T.PostId=WorkPostId AND IsUsed=1 AND OutTime IS NOT NULL 
+	group by ProjectId,UnitId,WorkPostId) AS PersonCountSum
+FROM dbo.t_d_EmployInOutRecord AS T
+--LEFT JOIN dbo.SitePerson_Person AS P ON T.ProjectId=P.ProjectId AND T.IDCardNo=P.IdentityCard
+LEFT JOIN dbo.Base_Unit AS U ON T.UnitId=U.UnitId
+--LEFT JOIN dbo.ProjectData_TeamGroup AS Team ON P.TeamGroupId=Team.TeamGroupId
+LEFT JOIN dbo.Base_WorkPost AS W ON T.PostId=W.WorkPostId
+WHERE  T.ProjectId = @ProjectId	
+AND (RecordDate >= @startTime OR @startTime IS NULL) 
+AND (RecordDate <= @endTime OR @endTime IS NULL) 
+AND (@unitId like '%'+T.UnitId+'%' OR @unitId IS NULL)	
+AND (@postId like '%'+T.PostId+'%' OR @postId IS NULL)	
+GROUP BY T.ProjectId,T.UnitId,U.UnitName,u.ShortUnitName,T.PostId,W.WorkPostName
+
+
+
+GO
+
+

SGGL/BLL/HSSE/SitePerson/PersonInOutService.cs

@@ -63,29 +63,33 @@ namespace BLL
                 };
                 db.SitePerson_PersonInOutNow.InsertOnSubmit(newPersonInOut);
                 db.SubmitChanges();
-
-                var getRealNameP = db.RealName_Project.FirstOrDefault(x => x.ProCode == newPersonInOut.ProCode);
-                if (getRealNameP != null)
+                /// 监理 业主 不进入
+                var getPUnit = db.Project_ProjectUnit.FirstOrDefault(x => x.ProjectId == newPersonInOut.ProjectId && x.UnitId == newPersonInOut.UnitId);
+                if (getPUnit.UnitType != Const.ProjectUnitType_3 && getPUnit.UnitType != Const.ProjectUnitType_4)
                 {
-                    Model.RealName_PersonInOutNow newR = new Model.RealName_PersonInOutNow
+                    var getRealNameP = db.RealName_Project.FirstOrDefault(x => x.ProCode == newPersonInOut.ProCode);
+                    if (getRealNameP != null)
                     {
-                        PersonInOutId = newPersonInOut.PersonInOutId,
-                        ProjectId = newPersonInOut.ProjectId,
-                        UnitId = newPersonInOut.UnitId,
-                        PersonId = newPersonInOut.PersonId,
-                        IsIn = newPersonInOut.IsIn,
-                        ChangeTime = newPersonInOut.ChangeTime,
-                        WorkPostId = newPersonInOut.WorkPostId,
-                        PostType = newPersonInOut.PostType,
-                        ProCode = newPersonInOut.ProCode,
-                        Name = newPersonInOut.Name,
-                        IdcardType = newPersonInOut.IdcardType ?? "SHENFEN_ZHENGJIAN",
-                        IdcardNumber = newPersonInOut.IdcardNumber,
-                        CheckType = "ZHENGCHANG_KAOQINLEIBIE",
-                        CheckWay = "FACE_FANGSHI",
-                    };
-                    db.RealName_PersonInOutNow.InsertOnSubmit(newR);
-                    db.SubmitChanges();
+                        Model.RealName_PersonInOutNow newR = new Model.RealName_PersonInOutNow
+                        {
+                            PersonInOutId = newPersonInOut.PersonInOutId,
+                            ProjectId = newPersonInOut.ProjectId,
+                            UnitId = newPersonInOut.UnitId,
+                            PersonId = newPersonInOut.PersonId,
+                            IsIn = newPersonInOut.IsIn,
+                            ChangeTime = newPersonInOut.ChangeTime,
+                            WorkPostId = newPersonInOut.WorkPostId,
+                            PostType = newPersonInOut.PostType,
+                            ProCode = newPersonInOut.ProCode,
+                            Name = newPersonInOut.Name,
+                            IdcardType = newPersonInOut.IdcardType ?? "SHENFEN_ZHENGJIAN",
+                            IdcardNumber = newPersonInOut.IdcardNumber,
+                            CheckType = "ZHENGCHANG_KAOQINLEIBIE",
+                            CheckWay = "FACE_FANGSHI",
+                        };
+                        db.RealName_PersonInOutNow.InsertOnSubmit(newR);
+                        db.SubmitChanges();
+                    }
                 }
             }
           

SGGL/BLL/ZHGL/RealName/SynchroSetService.cs

@@ -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
                                {