From ab5c1c6cbcdeb98d84bdde3c111fe871466d3a5c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Wed, 15 May 2024 10:38:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml
index 2bdb70d..0b1ef26 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/mapper/HkEventMapper.xml
@@ -19,7 +19,12 @@
bdb.dict_value as eventTypeName
from YWXT.sm_hk_event she
left join YWXT.blade_dict_biz bdb on bdb.dict_key = she.event_type and bdb.is_deleted = 0 and code = 'EVENT_TYPE'
- left join SJZT_MD."att_wmst_base" awb on awb."video_guid" = she.src_index
+ left join (
+ select "res_guid","video_guid" from SJZT_MD."att_wmst_base"
+ union all
+ select "regionindexcode" as "res_guid","gbindexcode" as "video_guid" from SJZT_ODS."haik_gb_wmst_base"
+ )
+ awb on awb."video_guid" = she.src_index
left join SJZT_MD."att_res_base" a on a."guid" = awb."res_guid"
left join SJZT_MD."att_ad_base" b on b."guid" = a."interior_ad_guid"
LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid"
--
Gitblit v1.9.3