From 8684e97db734a3a2da3423147bf12a111e6c44d6 Mon Sep 17 00:00:00 2001 From: Chase Tucker Date: Tue, 11 Feb 2025 11:04:58 -0700 Subject: [PATCH] Ensure approvals for user are pending --- MesaFabApproval.API/Services/ApprovalService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MesaFabApproval.API/Services/ApprovalService.cs b/MesaFabApproval.API/Services/ApprovalService.cs index 8871dd5..8966420 100644 --- a/MesaFabApproval.API/Services/ApprovalService.cs +++ b/MesaFabApproval.API/Services/ApprovalService.cs @@ -219,7 +219,9 @@ public class ApprovalService : IApprovalService { queryBuilder.Append($"select a.*, src.SubRoleCategoryItem from Approval a "); queryBuilder.Append("join SubRole sr on a.SubRoleID=sr.SubRoleID "); queryBuilder.Append("join SubRoleCategory src on sr.SubRoleCategoryID=src.SubRoleCategoryID "); - queryBuilder.Append($"where UserID={userId} and "); + queryBuilder.Append($"where UserID={userId} and ItemStatus=0 and "); + queryBuilder.Append($"(AssignedDate is not null and "); + queryBuilder.Append($"AssignedDate <= '{DateTimeOffset.Now.ToString("yyyy-MM-dd HH:mm:ss")}') and "); queryBuilder.Append($"((CompletedDate >= '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}') or "); queryBuilder.Append($"(CompletedDate is null));"); string sql = queryBuilder.ToString();