fix(report): 修正设备报表查询条件和时间范围

- 修正设备状态统计查询中的IS_FLAG条件从0改为1
- 修正故障来源分布查询中的日期比较符号使用HTML实体
- 优化设备参数值查询的时间范围条件,使用TRUNC函数替代TO_CHAR函数提高性能
- 统一设备产出数量查询的时间范围条件,确保当天数据的准确性
master
zangch@mesnac.com 2 weeks ago
parent fb44199747
commit 0913687294

@ -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
</select>
<!-- 查询故障来源分布(全量历史) -->
@ -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 &gt;= TRUNC(SYSDATE) - 30
GROUP BY TO_CHAR(ALARM_BEGIN_TIME, 'DD'), TRUNC(ALARM_BEGIN_TIME)
ORDER BY TRUNC(ALARM_BEGIN_TIME)
</select>
@ -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 &gt;= TRUNC(SYSDATE) AND COLLECT_TIME &lt; 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 &gt;= TRUNC(SYSDATE) AND COLLECT_TIME &lt; TRUNC(SYSDATE) + 1
)
WHERE RN = 1
</select>

Loading…
Cancel
Save