1

data_manage/pitcher_panel.py

@@ -576,8 +576,9 @@ concat(da60-da59 ,',' ,da60/cost ,',', (da60-da59)/cost ,',' ,da60/da1) d60,
 concat(dm3-da60 ,',' ,dm3/cost ,',', (dm3-da60)/cost ,',' ,dm3/da1) m3,
 concat(dm4-dm3 ,',' ,dm4/cost ,',', (dm4-dm3)/cost ,',' ,dm4/da1) m4,
 concat(dm5-dm4 ,',' ,dm5/cost ,',', (dm5-dm4)/cost ,',' ,dm5/da1) m5 
-from ( select * from  dw_channel where 1=1 {op1} {op2} {op3} {op4}  {op5}) a
+from ( select * from  dw_channel where 1=1 {op1} {op2} {op3} {op4} ) a
 left join  dw_channel_amount_daily b on a.channel=b.channel and a.dt=b.dt
+ {op5}
 """
 
     sumsql=f"""select '总计' date,

handlers/PitcherPanelHandler.py

@@ -111,7 +111,7 @@ class ChannelOrderTrend(BaseHandler):
         end = arg.get("end")
         page = arg.get("page", 1)
         page_size = arg.get("page_size", 10)
-        order_by = arg.get("order_by", 'dt')
+        order_by = arg.get("order_by", 'date')
         order = arg.get("order", 'desc')
         if 'date_range' in list(arg.keys()):
             end = self.get_n_days(0)