From a5eeb950d0df7d4727e185850fb429a4df26a4c5 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 11 Aug 2026 18:57:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dashboard):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=AE=BF=E9=97=AE=E8=AE=B0=E5=BD=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=94=AF=E6=8C=81=E4=BA=BA=E5=91=98=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/DaHuaAccessRecordMapper.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml index 5725e2b..f0c4ab0 100644 --- a/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DaHuaAccessRecordMapper.xml @@ -106,7 +106,19 @@ r.current_temperature, r.source_type, r.remark - + FROM dahua_access_record r + INNER JOIN mkmj m ON r.mkmj_id = m.id AND m.delete_enum = 'FALSE' + LEFT JOIN mkmj_passage p ON r.passage_id = p.id AND p.delete_enum = 'FALSE' + LEFT JOIN mkmj_gate g ON r.gate_id = g.id AND g.delete_enum = 'FALSE' + LEFT JOIN corp_info ci ON r.corp_id = ci.id AND ci.delete_enum = 'FALSE' + WHERE r.delete_enum = 'FALSE' + AND m.mkmj_level = 1 + + AND r.corp_id = #{params.corpinfoId} + + + AND ci.port_area = #{params.portArea} + ORDER BY r.swing_time DESC, r.id DESC