ck пре 4 година
родитељ
комит
ee13e69189
1 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      data_manage/pitcher_panel.py

+ 3 - 2
data_manage/pitcher_panel.py

@@ -833,6 +833,7 @@ def get_pitcher_trend(pitcher,start=None,end=None,page=None,page_size=None,order
             d1 first_amount,
             round(d1/cost,4) first_roi,
             round(reg_amount/cost,4) roi,
+            d7 reg_amount7,
             round(d7/cost,4) roi7,
             d30 reg_amount30,
             round(d30/cost,4) roi30,
@@ -876,9 +877,9 @@ def get_pitcher_trend(pitcher,start=None,end=None,page=None,page_size=None,order
     round(sum(first_amount)/sum(cost),4) first_roi,
     round(sum(reg_amount)/sum(cost),4) roi,
     sum(profit) profit,
-    round(sum(d7)/sum(cost),4) roi7,
+    round(sum(reg_amount7)/sum(cost),4) roi7,
     sum(reg_amount30) reg_amount30, 
-    round(sum(d30)/sum(cost),4) roi30 
+    round(sum(reg_amount30)/sum(cost),4) roi30 
     from ({sql}) a
     """