ck 4 gadi atpakaļ
vecāks
revīzija
1a87615c3d

+ 2 - 2
data_manage/public_analysis.py

@@ -188,8 +188,8 @@ def book_overview(start, end, book, type, page, page_size, order_by, order):
 
 
     sql = f"""
     sql = f"""
             select book,type,
             select book,type,
-                min(dt) start_date,
-                max(dt) end_date,
+                DATE_FORMAT(min(dt),'%Y/%m/%d') start_date,
+                DATE_FORMAT(max(dt),'%Y/%m/%d') end_date,
                 sum(cost) cost,
                 sum(cost) cost,
                 sum(reg_order_amount) amount,
                 sum(reg_order_amount) amount,
                 sum(first_order_amount) first_amount,
                 sum(first_order_amount) first_amount,

+ 4 - 0
handlers/PublicAnalysisHandler.py

@@ -56,9 +56,13 @@ class BookOverview(BaseHandler):
         book = arg.get("book")
         book = arg.get("book")
         type = arg.get("type")
         type = arg.get("type")
         page = arg.get("page")
         page = arg.get("page")
+        date_range = arg.get("date_range")
         page_size = arg.get("page_size")
         page_size = arg.get("page_size")
         order_by = arg.get("order_by", 'cost')
         order_by = arg.get("order_by", 'cost')
         order = arg.get("order", 'desc')
         order = arg.get("order", 'desc')
+        if date_range:
+            end = self.get_n_days(0)
+            start = self.get_n_days(-int(date_range)+1)
         data, total = book_overview(start, end, book, type, page, page_size, order_by, order)
         data, total = book_overview(start, end, book, type, page, page_size, order_by, order)
         if arg.get("download"):
         if arg.get("download"):
             self.write_download('BookOver_'+str(int(time.time())), data)
             self.write_download('BookOver_'+str(int(time.time())), data)