From 7e3c0cdc48868d51976ba16a1396d5bbf8d9637a Mon Sep 17 00:00:00 2001 From: CIEF DataTeam Date: Tue, 1 Aug 2023 09:08:23 +0000 Subject: [PATCH] Only with company_id who order before --- .../rep_shipping__company_order_usages.sql | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/models/marts/reporting/rep_shipping__company_order_usages.sql b/models/marts/reporting/rep_shipping__company_order_usages.sql index edc47af..d9e1bab 100644 --- a/models/marts/reporting/rep_shipping__company_order_usages.sql +++ b/models/marts/reporting/rep_shipping__company_order_usages.sql @@ -18,16 +18,24 @@ dates AS ( -- LOGIC {% for time_grain in time_grain_list %} - sub_company_register_{{time_grain}} AS ( + sub_company_first_time_order_{{time_grain}} AS ( SELECT - sub_company_id, - sub_company_marking_id, - dates.first_day_of_{{time_grain}} AS company_register_{{time_grain}} + origin_warehouse_shipping_packing_lists.sub_company_id, + shipping_companies.sub_company_marking_id, + MIN(dates.first_day_of_{{time_grain}}) AS company_first_time_order_{{time_grain}} - FROM shipping_companies + FROM origin_warehouse_shipping_packing_lists + + LEFT JOIN shipping_companies + ON (origin_warehouse_shipping_packing_lists.sub_company_id = shipping_companies.sub_company_id) LEFT JOIN dates - ON (date(shipping_companies.sub_company_created_datetime) = dates.date_day) + ON (date(origin_warehouse_shipping_packing_lists.origin_warehouse_shipping_order_created_datetime) = dates.date_day) + + GROUP BY + origin_warehouse_shipping_packing_lists.sub_company_id, + shipping_companies.sub_company_marking_id + ), origin_warehouse_shipping_packing_list_{{time_grain}} AS ( @@ -43,16 +51,16 @@ dates AS ( register_date_and_company_id_combination_{{time_grain}} AS ( SELECT - DISTINCT c.company_register_{{time_grain}} AS event_date, + DISTINCT c.company_first_time_order_{{time_grain}} AS event_date, '{{time_grain|upper}}LY' AS time_grain_filter, c1.sub_company_id, c1.sub_company_marking_id - FROM sub_company_register_{{time_grain}} AS c + FROM sub_company_first_time_order_{{time_grain}} AS c - CROSS JOIN sub_company_register_{{time_grain}} AS c1 + CROSS JOIN sub_company_first_time_order_{{time_grain}} AS c1 - WHERE c.company_register_{{time_grain}} >= c1.company_register_{{time_grain}} + WHERE c.company_first_time_order_{{time_grain}} >= c1.company_first_time_order_{{time_grain}} ORDER BY event_date ),