From c580a8a9bf969643802b3f057ec9b377b0dacdf2 Mon Sep 17 00:00:00 2001 From: timofejmalinin Date: Mon, 14 Nov 2022 22:54:44 +0400 Subject: [PATCH] New filters --- service/utils.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/service/utils.py b/service/utils.py index f1bac5e..bc32bb3 100644 --- a/service/utils.py +++ b/service/utils.py @@ -21,17 +21,21 @@ def raschet(tables, filters, koefs): for table in tables: if 'point' in table: if msk_ao is not None: - query = f"select * from {table} where msk_ao={msk_ao} and category in ({categories});" + query = f"select * from {table} where msk_ao={msk_ao} and category in ({categories});" if len(categories) > 0 else f"select * from {table} where msk_ao={msk_ao};" + elif msk_rayon is not None: + query = f"select * from {table} where msk_rayon={msk_rayon} and category in ({categories});" if len(categories) > 0 else f"select * from {table} where msk_rayon={msk_rayon};" else: - query = f"select * from {table} where msk_rayon={msk_rayon} and category in ({categories});" + query = f"select * from {table} where category in ({categories});" if len(categories) > 0 else f"select * from {table};" points = pd.read_sql(query, conn) points_df = raschet_real(points, koefs) if 'net' in table: if msk_ao is not None: query = f"select * from {table} where msk_ao={msk_ao};" - else: + elif msk_rayon is not None: query = f"select * from {table} where msk_rayon={msk_rayon};" + else: + query = f"select * from {table};" nets = pd.read_sql(query, conn) nets_df = raschet_real(nets, koefs)