Merge branch 'main2' into 'main'

release 1

See merge request leaders2022/postamates!2

service/utils.py

@@ -28,13 +28,10 @@ def raschet(tables, filters, koefs):
             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:
-            #     query = f"select * from {table} where msk_rayon={msk_rayon};"
-
-            query = f"select * from {table};"
-            #
+            if msk_ao is not None:
+                query = f"select * from {table} where msk_ao={msk_ao};"
+            else:
+                query = f"select * from {table} where msk_rayon={msk_rayon};"
             nets = pd.read_sql(query, conn)
             nets_df = raschet_real(nets, koefs)