|
@@ -128,7 +128,7 @@ concat(a60-a59,',',(a60-a59)/cost,',',a60/cost) d60,
|
|
|
concat(m3-a60,',',(m3-a60)/cost,',',m3/cost) m3,
|
|
|
concat(m4-m3,',',(m4-m3)/cost,',',m4/cost) m4,
|
|
|
concat(m5-m4,',',(m5-m4)/cost,',',m5/cost) m5
|
|
|
-from book_trend where 1=1 {op1} {op2} {op3} {op4} {op5} {op6}
|
|
|
+from book_trend where 1=1 {op1} {op2} {op4} {op5} {op6}
|
|
|
"""
|
|
|
|
|
|
sum_sql=f"""select concat(date_format(min(dt),'%Y/%m/%d'),'~',date_format(max(dt),'%Y/%m/%d')) dt,
|
|
@@ -156,7 +156,7 @@ from ({sql}) a
|
|
|
"""
|
|
|
|
|
|
data, total, total_data = getLimitSumData(db.dm, sql, sum_sql, page, page_size)
|
|
|
-
|
|
|
+
|
|
|
def parse(str):
|
|
|
li=str.split(',')
|
|
|
li[0]=round(float(li[0]),2)
|