@@ -140,7 +140,7 @@ class RechargeStatement(object):
...
@@ -140,7 +140,7 @@ class RechargeStatement(object):
ifexport_status:
ifexport_status:
query1=(' and '.join(query[0]))
query1=(' and '.join(query[0]))
query2=(' and '.join(query[1]))
query2=(' and '.join(query[1]))
sql=f"SELECT id,uuid,(amount/1000) as amount as amount,FROM_UNIXTIME(create_time) as payment_time,reference_type,reference_number FROM assets_log_{int(now_month[0])} where {query1} UNION ALL SELECT id,uuid,amount/1000 as amount,FROM_UNIXTIME(create_time) as payment_time,reference_type,reference_number FROM assets_log_{int(now_month[1])} where {query2} ORDER BY payment_time"
sql=f"SELECT id,uuid,(amount/1000) as amount,FROM_UNIXTIME(create_time) as payment_time,reference_type,reference_number FROM assets_log_{int(now_month[0])} where {query1} UNION ALL SELECT id,uuid,amount/1000 as amount,FROM_UNIXTIME(create_time) as payment_time,reference_type,reference_number FROM assets_log_{int(now_month[1])} where {query2} ORDER BY payment_time"