Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -486,7 +486,7 @@ SELECT
|
|||||||
COALESCE(sc.code,'') AS code,
|
COALESCE(sc.code,'') AS code,
|
||||||
COALESCE(sc.title,'') AS title,
|
COALESCE(sc.title,'') AS title,
|
||||||
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
|
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
|
||||||
COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS at
|
COALESCE(to_char(z.zlins_dttm, 'YYYY-MM-DD HH24:MI:SS'), '') AS at
|
||||||
FROM zbggcampaign z
|
FROM zbggcampaign z
|
||||||
LEFT JOIN sdcampaign sc
|
LEFT JOIN sdcampaign sc
|
||||||
ON sc.id = z.sdcampaign_id
|
ON sc.id = z.sdcampaign_id
|
||||||
@@ -877,7 +877,7 @@ SELECT
|
|||||||
COALESCE(sc.code,'') AS code,
|
COALESCE(sc.code,'') AS code,
|
||||||
COALESCE(sc.title,'') AS title,
|
COALESCE(sc.title,'') AS title,
|
||||||
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
|
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
|
||||||
COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS campaign_last_dttm
|
COALESCE(to_char(z.zlins_dttm, 'YYYY-MM-DD HH24:MI:SS'), '') AS campaign_last_dttm
|
||||||
FROM latest l
|
FROM latest l
|
||||||
LEFT JOIN zbggcampaign z
|
LEFT JOIN zbggcampaign z
|
||||||
ON z.id = l.z_id
|
ON z.id = l.z_id
|
||||||
|
|||||||
Reference in New Issue
Block a user