From 84bc9ec06e6990321a61a8246deeca595114582c Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Mon, 22 Dec 2025 11:51:40 +0700 Subject: [PATCH] fix: Modify equipment service query to handle null `actfinish` or `actstart` in duration condition. --- src/equipment/service.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/equipment/service.py b/src/equipment/service.py index 86d880d..f7bd855 100644 --- a/src/equipment/service.py +++ b/src/equipment/service.py @@ -147,7 +147,11 @@ JOINED_MAXIMO_SQL = text( a.asset_unit = '3' AND a.wonum NOT LIKE 'T%' AND a.asset_assetnum = :assetnum - AND (EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600.0) <= 730 + AND ( + a.actfinish IS NULL + OR a.actstart IS NULL + OR (EXTRACT(EPOCH FROM (a.actfinish - a.actstart)) / 3600.0) <= 730 + ) AND ( (a.worktype = 'CM' AND a.wojp8 != 'S1') OR (a.worktype <> 'CM')