This commit is contained in:
2022-03-01 20:01:52 +00:00
parent ac46eb394d
commit 4f76d2f3e4
2 changed files with 21 additions and 13 deletions

View File

@@ -10,7 +10,14 @@ namespace AyaNova.KPI
private string _dataQuery = null;
private string _errorMessage = null;
public AuthorizationRoles AllowedRoles { get => AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted; }
public AuthorizationRoles AllowedRoles
{
get => AuthorizationRoles.BizAdmin |
AuthorizationRoles.BizAdminRestricted |
AuthorizationRoles.ServiceRestricted |
AuthorizationRoles.Service |
AuthorizationRoles.Accounting;
}
public string MetaQuery => _metaQuery;
public string DataQuery => _dataQuery;
@@ -62,18 +69,19 @@ namespace AyaNova.KPI
_dataQuery = @$"SELECT row_to_json(t) as res from (
select SUM(AWORKORDERITEMLABOR.serviceratequantity) y, date_trunc('{interval}',AWORKORDERITEMLABOR.servicestopdate) x
FROM AWORKORDER
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
WHERE AWORKORDERITEMLABOR.userid = {userId} AND {dateWhere} {techTagsWhere} {woTagsWhere} {woItemTagsWhere}
GROUP BY x
ORDER BY x ASC
SELECT SUM(AWORKORDERITEMLABOR.SERVICERATEQUANTITY) Y,DATE_TRUNC('day', AWORKORDERITEMLABOR.SERVICESTOPDATE) X, AUSER.ID Z
FROM AWORKORDER
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
LEFT JOIN AUSER ON AWORKORDERITEMLABOR.USERID = AUSER.ID
WHERE {dateWhere} {techTagsWhere} {woTagsWhere} {woItemTagsWhere}
GROUP BY Z, X
ORDER BY X ASC
) t";
_metaQuery =
@"SELECT row_to_json(t) as res from (
select name from auser where id = 10
) t";
_metaQuery = string.Empty;
// @"SELECT row_to_json(t) as res from (
// select name from auser where id = 10
// ) t";
}