12.08.2026 17:30 Логика формирования отчетов работает, все отсутствия учитываются, логика присутствия сотрудников в случае сбоя СКУД на работе настроена.

services/scud_export.py

@@ -81,11 +81,13 @@ WITH DailyLogs AS (
     WHERE log.TimeVal BETWEEN @StartDate AND @EndDate
       AND log.HozOrgan IS NOT NULL
       AND log.HozOrgan > 0
+      AND log.Event IN (26, 27, 28, 29, 32, 33, 54, 55, 64, 65)
 ),
 Passages AS (
     SELECT
         EmployeeID,
         MIN(TimeVal) AS FirstRawEvent,
+        MAX(TimeVal) AS LastRawEvent,
         MIN(CASE WHEN Direction = 'IN' THEN TimeVal END) AS FirstIn,
         MAX(CASE WHEN Direction = 'OUT' THEN TimeVal END) AS LastOut,
         MAX(CASE WHEN RowNumDesc = 1 THEN Direction END) AS LastEventType
@@ -116,21 +118,23 @@ SELECT
             THEN N'Нет выхода'
         WHEN pass.LastOut IS NOT NULL AND pass.LastOut > pass.FirstIn
             THEN CAST(CONVERT(VARCHAR(8), pass.LastOut, 108) AS NVARCHAR(20))
+        WHEN @TargetDate < CAST(GETDATE() AS DATE) AND pass.LastRawEvent IS NOT NULL AND pass.LastRawEvent > ISNULL(pass.FirstIn, pass.FirstRawEvent)
+            THEN CAST(CONVERT(VARCHAR(8), pass.LastRawEvent, 108) AS NVARCHAR(20))
         ELSE N'Нет выхода'
     END AS [Конец_дня],
     CASE
-        WHEN pass.EmployeeID IS NOT NULL AND pass.FirstIn IS NOT NULL THEN
+        WHEN pass.EmployeeID IS NOT NULL AND (pass.FirstIn IS NOT NULL OR pass.FirstRawEvent IS NOT NULL) THEN
             RIGHT('0' + CAST(DATEDIFF(MINUTE,
-                pass.FirstIn,
+                ISNULL(pass.FirstIn, pass.FirstRawEvent),
                 CASE 
                     WHEN @TargetDate = CAST(GETDATE() AS DATE) AND (pass.LastEventType = 'IN' OR pass.LastOut IS NULL OR pass.LastOut <= pass.FirstIn) THEN GETDATE()
-                    ELSE ISNULL(pass.LastOut, pass.FirstIn)
+                    ELSE ISNULL(pass.LastOut, pass.LastRawEvent)
                 END) / 60 AS VARCHAR), 2) + ':' +
             RIGHT('0' + CAST(DATEDIFF(MINUTE,
-                pass.FirstIn,
+                ISNULL(pass.FirstIn, pass.FirstRawEvent),
                 CASE 
                     WHEN @TargetDate = CAST(GETDATE() AS DATE) AND (pass.LastEventType = 'IN' OR pass.LastOut IS NULL OR pass.LastOut <= pass.FirstIn) THEN GETDATE()
-                    ELSE ISNULL(pass.LastOut, pass.FirstIn)
+                    ELSE ISNULL(pass.LastOut, pass.LastRawEvent)
                 END) % 60 AS VARCHAR), 2)
         ELSE N'00:00'
     END AS [Находился_в_здании],