|
|
@@ -77,11 +77,12 @@ class ChannelOverview(BaseHandler):
|
|
|
stage = args.get("stage")
|
|
|
page = args.get("page")
|
|
|
book = args.get('book')
|
|
|
+ type = args.get('type')
|
|
|
agent_id= args.get('agent_id')
|
|
|
page_size = args.get("page_size")
|
|
|
order_by = args.get("order_by", 'date')
|
|
|
order = args.get("order", 'desc')
|
|
|
- data, total, total_data = get_channel_overview(user_id, channel, pitcher, stage, book, agent_id, start, end, page,
|
|
|
+ data, total, total_data = get_channel_overview(user_id, channel, pitcher, type, stage, book, agent_id, start, end, page,
|
|
|
page_size, order_by, order)
|
|
|
if args.get("download"):
|
|
|
self.write_download(str(int(time.time())), data)
|
|
|
@@ -147,13 +148,14 @@ class ChannelOrderTrend(BaseHandler):
|
|
|
pitcher = arg.get("pitcher")
|
|
|
agent_id = arg.get("agent_id")
|
|
|
channel = arg.get("channel")
|
|
|
+ game = arg.get("book")
|
|
|
start = arg.get("start", self.get_n_days(-30)) if channel else arg.get("start", self.thisday)
|
|
|
end = arg.get("end")
|
|
|
page = arg.get("page")
|
|
|
page_size = arg.get("page_size")
|
|
|
order_by = arg.get("order_by", 'date')
|
|
|
order = arg.get("order", 'desc')
|
|
|
- data, total, total_data = get_channel_order_trend(user_id, channel, pitcher, agent_id, start, end, page, page_size,
|
|
|
+ data, total, total_data = get_channel_order_trend(user_id, channel, game, pitcher, agent_id, start, end, page, page_size,
|
|
|
order_by, order)
|
|
|
if arg.get("download"):
|
|
|
self.write_download("channelTrend_" + str(int(time.time())), data)
|
cola