This commit is contained in:
2022-03-02 19:46:21 +00:00
parent b65ddfbe09
commit bd0ff206e4

View File

@@ -20,17 +20,13 @@ namespace AyaNova.KPI
public string ErrorMessage => _errorMessage; public string ErrorMessage => _errorMessage;
public void BuildQuery(KPIRequestOptions options, long userId) public void BuildQuery(KPIRequestOptions options, long userId)
{ {
var wotags = options.Criteria["wotags"].ToObject<List<string>>(); var wotags = options.Criteria["wotags"].ToObject<List<string>>();
bool wotagsany = options.Criteria["wotagsany"].ToObject<bool>();
var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>(); var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject<bool>();
string woTagsWhere = null; string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);
if (wotags.Count > 0) string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ;
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));
_dataQuery = @$"SELECT row_to_json(t) as res from ( _dataQuery = @$"SELECT row_to_json(t) as res from (
SELECT distinct(AWORKORDER.ID), SELECT distinct(AWORKORDER.ID),