This commit is contained in:
@@ -84,7 +84,31 @@ select X,Z,
|
|||||||
from subq
|
from subq
|
||||||
order by x ASC;
|
order by x ASC;
|
||||||
|
|
||||||
|
...
|
||||||
|
WITH SUBQ AS
|
||||||
|
(SELECT COUNT(AWORKORDER.ID) WOCOUNT,
|
||||||
|
DATE_TRUNC('month', AWORKORDER.CREATEDDATE) X,
|
||||||
|
(aworkorder.laststatusid is not null AND AWORKORDERSTATUS.COMPLETED = TRUE AND laststate.created < aworkorder.completebydate) Z
|
||||||
|
FROM AWORKORDER
|
||||||
|
LEFT JOIN AWORKORDERSTATUS ON (AWORKORDER.LASTSTATUSID = AWORKORDERSTATUS.ID)
|
||||||
|
LEFT JOIN LATERAL
|
||||||
|
|
||||||
|
(SELECT created
|
||||||
|
FROM aworkorderstate
|
||||||
|
WHERE aworkorderstate.workorderid = aworkorder.id
|
||||||
|
ORDER BY aworkorderstate.created DESC
|
||||||
|
LIMIT 1) AS laststate ON TRUE
|
||||||
|
|
||||||
|
WHERE AWORKORDER.COMPLETEBYDATE < NOW()
|
||||||
|
AND AWORKORDER.CREATEDDATE > '1753-01-02T08:00:59.9990000Z'
|
||||||
|
AND AWORKORDER.CREATEDDATE < '2022-03-03T01:00:00.0000000Z'
|
||||||
|
|
||||||
|
GROUP BY X,Z)
|
||||||
|
SELECT X,Z,
|
||||||
|
ROUND(WOCOUNT / SUM(WOCOUNT) OVER (PARTITION BY X) * 100,2) AS Y
|
||||||
|
FROM SUBQ
|
||||||
|
ORDER BY X ASC
|
||||||
|
...
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ export default {
|
|||||||
};
|
};
|
||||||
|
|
||||||
this.obj.forEach(z => {
|
this.obj.forEach(z => {
|
||||||
if (z.z == false) {
|
if (z.z == true) {
|
||||||
onTime.data.push({ x: z.x, y: z.y });
|
onTime.data.push({ x: z.x, y: z.y });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user