Merge remote-tracking branch 'origin/dev' into dev

data_manage/public_analysis.py

@@ -402,11 +402,11 @@ def image_rank(start, end, type,book, page, page_size, order_by, order):
 
     db = MysqlUtils().quchen_text
 
-    sql =f"""select image_id,preview_url,
+    sql =f"""select preview_url,
             sum(cost),
             round(sum(click_count)/sum(view_count),4) ctr,
             round(sum(cost)/sum(click_count),2) cpc
-            from dm_image_cost_day where 1=1 {op1} {op2} {op3} {op4} GROUP BY image_id,preview_url 
+            from dm_image_cost_day where preview_url!='' {op1} {op2} {op3} {op4} GROUP BY signature,preview_url
             {op5} """
 
     return getLimitData(db, sql, page, page_size)

handlers/PublicAnalysisHandler.py

@@ -115,8 +115,8 @@ class BossPanelSummary(BaseHandler):
             end = arg.get("end")
             page = arg.get("page")
             page_size = arg.get("page_size")
-            order_by = arg.get("order_by")
-            order = arg.get("order")
+            order_by = arg.get("order_by",'dt')
+            order = arg.get("order",'desc')
             pitcher = arg.get("pitcher")
             date_range = arg.get("date_range")
             type = arg.get("type")