diff --git a/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml b/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml index 6d840ab..a8e067f 100644 --- a/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml +++ b/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml @@ -64,7 +64,7 @@ SUM(CASE WHEN DEVICE_STATUS = 2 THEN 1 ELSE 0 END) AS SCRAP_COUNT, SUM(CASE WHEN DEVICE_TYPE = '2' THEN 1 ELSE 0 END) AS EXPERIMENT_COUNT FROM BASE_DEVICELEDGER - WHERE IS_FLAG = 0 + WHERE IS_FLAG = 1 @@ -85,7 +85,7 @@ SELECT TO_CHAR(ALARM_BEGIN_TIME, 'DD') AS dateValue, COUNT(*) AS faultCount FROM DMS_RECORD_ALARM_INFO - WHERE ALARM_BEGIN_TIME >= TRUNC(SYSDATE) - 30 + WHERE ALARM_BEGIN_TIME >= TRUNC(SYSDATE) - 30 GROUP BY TO_CHAR(ALARM_BEGIN_TIME, 'DD'), TRUNC(ALARM_BEGIN_TIME) ORDER BY TRUNC(ALARM_BEGIN_TIME) @@ -106,7 +106,7 @@ ROW_NUMBER() OVER (PARTITION BY DEVICE_CODE ORDER BY COLLECT_TIME DESC) AS RN FROM BASE_DEVICE_PARAM_VAL WHERE PARAM_NAME = '机台状态-实际产出数量' - AND TO_CHAR(COLLECT_TIME, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD') + AND COLLECT_TIME >= TRUNC(SYSDATE) AND COLLECT_TIME < TRUNC(SYSDATE) + 1 ) WHERE RN = 1 ) p ON d.DEVICE_CODE = p.DEVICE_CODE @@ -122,7 +122,7 @@ ROW_NUMBER() OVER (PARTITION BY DEVICE_CODE ORDER BY COLLECT_TIME DESC) AS RN FROM BASE_DEVICE_PARAM_VAL WHERE PARAM_NAME = '机台状态-实际产出数量' - AND TO_CHAR(COLLECT_TIME, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD') + AND COLLECT_TIME >= TRUNC(SYSDATE) AND COLLECT_TIME < TRUNC(SYSDATE) + 1 ) WHERE RN = 1