diff --git a/dev/workflow/TK_Cust/partner1site/partner_summary_report/S98_S_partner_summary_report.sql b/dev/workflow/TK_Cust/partner1site/partner_summary_report/S98_S_partner_summary_report.sql index 945a813..32407fb 100644 --- a/dev/workflow/TK_Cust/partner1site/partner_summary_report/S98_S_partner_summary_report.sql +++ b/dev/workflow/TK_Cust/partner1site/partner_summary_report/S98_S_partner_summary_report.sql @@ -5,8 +5,7 @@ delete from p10_sa.S98_S_partner_summary_report ; insert into p10_sa.S98_S_partner_summary_report -( accepted - , address +( address , advantage , alias , apply_admin_name @@ -47,6 +46,7 @@ insert into p10_sa.S98_S_partner_summary_report , product_type , progress , province + , record_id , region_name , remark , report_num @@ -64,8 +64,7 @@ insert into p10_sa.S98_S_partner_summary_report , way , etl_tx_dt ) select - accepted - , address + address , advantage , alias , apply_admin_name @@ -106,6 +105,7 @@ insert into p10_sa.S98_S_partner_summary_report , product_type , progress , province + , record_id , region_name , remark , report_num @@ -128,8 +128,7 @@ insert into p10_sa.S98_S_partner_summary_report ; ; insert into p12_sfull.S98_S_partner_summary_report -( accepted - , address +( address , advantage , alias , apply_admin_name @@ -170,6 +169,7 @@ insert into p12_sfull.S98_S_partner_summary_report , product_type , progress , province + , record_id , region_name , remark , report_num @@ -187,8 +187,7 @@ insert into p12_sfull.S98_S_partner_summary_report , way , etl_tx_dt ) select - accepted - , address + address , advantage , alias , apply_admin_name @@ -229,6 +228,7 @@ insert into p12_sfull.S98_S_partner_summary_report , product_type , progress , province + , record_id , region_name , remark , report_num diff --git a/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_foreign_tables.sql b/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_foreign_tables.sql index 02cecd3..24258e2 100644 --- a/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_foreign_tables.sql +++ b/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_foreign_tables.sql @@ -1,7 +1,6 @@ CREATE FOREIGN TABLE if not exists p00_tal.S98_S_partner_summary_report ( - accepted TEXT - , address TEXT + address TEXT , advantage TEXT , alias TEXT , apply_admin_name TEXT @@ -42,6 +41,7 @@ CREATE FOREIGN TABLE if not exists p00_tal.S98_S_partner_summary_report ( , product_type TEXT , progress TEXT , province TEXT + , record_id TEXT , region_name TEXT , remark TEXT , report_num TEXT diff --git a/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_tables.sql b/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_tables.sql index b79cbfd..2ba46b5 100644 --- a/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_tables.sql +++ b/dev/workflow/TK_Cust/partner1site/partner_summary_report/sa_tables.sql @@ -1,7 +1,6 @@ create table if not exists p10_sa.S98_S_partner_summary_report ( - accepted TEXT - , address TEXT + address TEXT , advantage TEXT , alias TEXT , apply_admin_name TEXT @@ -42,6 +41,7 @@ create table if not exists p10_sa.S98_S_partner_summary_report ( , product_type TEXT , progress TEXT , province TEXT + , record_id TEXT , region_name TEXT , remark TEXT , report_num TEXT @@ -60,7 +60,6 @@ create table if not exists p10_sa.S98_S_partner_summary_report ( , etl_tx_dt TIMESTAMP ) ; - COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.accepted IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.address IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.advantage IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.alias IS ''; @@ -102,6 +101,7 @@ create table if not exists p10_sa.S98_S_partner_summary_report ( COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.product_type IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.progress IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.province IS ''; + COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.record_id IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.region_name IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.remark IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_report.report_num IS ''; @@ -124,8 +124,7 @@ COMMENT ON TABLE p10_sa.S98_S_partner_summary_report IS ''; create table if not exists p12_sfull.S98_S_partner_summary_report ( - accepted TEXT - , address TEXT + address TEXT , advantage TEXT , alias TEXT , apply_admin_name TEXT @@ -166,6 +165,7 @@ create table if not exists p12_sfull.S98_S_partner_summary_report ( , product_type TEXT , progress TEXT , province TEXT + , record_id TEXT , region_name TEXT , remark TEXT , report_num TEXT @@ -184,7 +184,6 @@ create table if not exists p12_sfull.S98_S_partner_summary_report ( , etl_tx_dt TIMESTAMP ) ; - COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.accepted IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.address IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.advantage IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.alias IS ''; @@ -226,6 +225,7 @@ create table if not exists p12_sfull.S98_S_partner_summary_report ( COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.product_type IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.progress IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.province IS ''; + COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.record_id IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.region_name IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.remark IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_report.report_num IS ''; diff --git a/dev/workflow/TK_Cust/partner1site/partner_summary_visit/S98_S_partner_summary_visit.sql b/dev/workflow/TK_Cust/partner1site/partner_summary_visit/S98_S_partner_summary_visit.sql index b25e015..d7216fa 100644 --- a/dev/workflow/TK_Cust/partner1site/partner_summary_visit/S98_S_partner_summary_visit.sql +++ b/dev/workflow/TK_Cust/partner1site/partner_summary_visit/S98_S_partner_summary_visit.sql @@ -32,6 +32,7 @@ insert into p10_sa.S98_S_partner_summary_visit , tsm_names_by_alias , visit_remark , visitor + , id , etl_tx_dt ) select alias @@ -61,6 +62,7 @@ insert into p10_sa.S98_S_partner_summary_visit , tsm_names_by_alias , visit_remark , visitor + , id , etl_tx_dt from p00_tal.S98_S_partner_summary_visit ; @@ -95,6 +97,7 @@ insert into p12_sfull.S98_S_partner_summary_visit , tsm_names_by_alias , visit_remark , visitor + , id , etl_tx_dt ) select alias @@ -124,6 +127,7 @@ insert into p12_sfull.S98_S_partner_summary_visit , tsm_names_by_alias , visit_remark , visitor + , id , etl_tx_dt from p10_sa.S98_S_partner_summary_visit ; diff --git a/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_foreign_tables.sql b/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_foreign_tables.sql index 7539335..54d381f 100644 --- a/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_foreign_tables.sql +++ b/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_foreign_tables.sql @@ -27,6 +27,7 @@ CREATE FOREIGN TABLE if not exists p00_tal.S98_S_partner_summary_visit ( , tsm_names_by_alias TEXT , visit_remark TEXT , visitor TEXT + , id TEXT , etl_tx_dt TIMESTAMP ) diff --git a/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_tables.sql b/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_tables.sql index 66055f6..5c486aa 100644 --- a/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_tables.sql +++ b/dev/workflow/TK_Cust/partner1site/partner_summary_visit/sa_tables.sql @@ -27,6 +27,7 @@ create table if not exists p10_sa.S98_S_partner_summary_visit ( , tsm_names_by_alias TEXT , visit_remark TEXT , visitor TEXT + , id TEXT , etl_tx_dt TIMESTAMP ) ; @@ -57,6 +58,7 @@ create table if not exists p10_sa.S98_S_partner_summary_visit ( COMMENT ON COLUMN p10_sa.S98_S_partner_summary_visit.tsm_names_by_alias IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_visit.visit_remark IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_visit.visitor IS ''; + COMMENT ON COLUMN p10_sa.S98_S_partner_summary_visit.id IS ''; COMMENT ON COLUMN p10_sa.S98_S_partner_summary_visit.etl_tx_dt IS ''; COMMENT ON TABLE p10_sa.S98_S_partner_summary_visit IS ''; @@ -91,6 +93,7 @@ create table if not exists p12_sfull.S98_S_partner_summary_visit ( , tsm_names_by_alias TEXT , visit_remark TEXT , visitor TEXT + , id TEXT , etl_tx_dt TIMESTAMP ) ; @@ -121,6 +124,7 @@ create table if not exists p12_sfull.S98_S_partner_summary_visit ( COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_visit.tsm_names_by_alias IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_visit.visit_remark IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_visit.visitor IS ''; + COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_visit.id IS ''; COMMENT ON COLUMN p12_sfull.S98_S_partner_summary_visit.etl_tx_dt IS ''; COMMENT ON TABLE p12_sfull.S98_S_partner_summary_visit IS ''; diff --git a/dev/workflow/TK_Cust/partner1site/获取客户拜访数据/part_summary_visit_feign.py b/dev/workflow/TK_Cust/partner1site/获取客户拜访数据/part_summary_visit_feign.py index f9810fc..47eb75a 100644 --- a/dev/workflow/TK_Cust/partner1site/获取客户拜访数据/part_summary_visit_feign.py +++ b/dev/workflow/TK_Cust/partner1site/获取客户拜访数据/part_summary_visit_feign.py @@ -132,7 +132,7 @@ def main(): data = client.fetch_all_pages( api_name="visits", - params={'startInsertDate':'2000-1-1'} # 拉全量，若有默认时间限制可改成 {"startInsertDate":"2000-01-01","endInsertDate":get_previous_date(0)} + params={} # 拉全量，若有默认时间限制可改成 {"startInsertDate":"2000-01-01","endInsertDate":get_previous_date(0)} ) save_json_to_pg(data, API_ID) diff --git a/dev/workflow/TK_Cust/partner1site/获取报备数据/part_summary_report_feign.py b/dev/workflow/TK_Cust/partner1site/获取报备数据/part_summary_report_feign.py index b1f3bdb..aef98c6 100644 --- a/dev/workflow/TK_Cust/partner1site/获取报备数据/part_summary_report_feign.py +++ b/dev/workflow/TK_Cust/partner1site/获取报备数据/part_summary_report_feign.py @@ -132,7 +132,7 @@ def main(): data = client.fetch_all_pages( api_name="reports", - params={'startInsertDate':'2000-1-1'} # 拉全量，若有默认时间限制可改成 {"startInsertDate":"2000-01-01","endInsertDate":get_previous_date(0)} + params={} # 拉全量，若有默认时间限制可改成 {"startInsertDate":"2000-01-01","endInsertDate":get_previous_date(0)} )