From bd0ff206e4e4d74e93cb1c7d2b9d399d488bb6b4 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 2 Mar 2022 19:46:21 +0000 Subject: [PATCH] --- server/AyaNova/kpi/WorkOrderOverduePersonalList.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/kpi/WorkOrderOverduePersonalList.cs b/server/AyaNova/kpi/WorkOrderOverduePersonalList.cs index 46d73c78..2a7ec65a 100644 --- a/server/AyaNova/kpi/WorkOrderOverduePersonalList.cs +++ b/server/AyaNova/kpi/WorkOrderOverduePersonalList.cs @@ -20,17 +20,13 @@ namespace AyaNova.KPI public string ErrorMessage => _errorMessage; public void BuildQuery(KPIRequestOptions options, long userId) - { + { var wotags = options.Criteria["wotags"].ToObject>(); + bool wotagsany = options.Criteria["wotagsany"].ToObject(); var woitemtags = options.Criteria["woitemtags"].ToObject>(); - - string woTagsWhere = null; - if (wotags.Count > 0) - woTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorder.tags", DataListFilterComparisonOperator.Contains, string.Join(",", wotags)); - - string woItemTagsWhere = null; - if (woitemtags.Count > 0) - woItemTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorderitem.tags", DataListFilterComparisonOperator.Contains, string.Join(",", woitemtags)); + bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject(); + string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany); + string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ; _dataQuery = @$"SELECT row_to_json(t) as res from ( SELECT distinct(AWORKORDER.ID),