优化充值报表列表字段显示

app/api/statement/crud.py

@@ -123,7 +123,7 @@ class RechargeStatement(object):
             count = self.linkmysql.query_mysql(count_sql)[0].get("sum(a.b)")
             query1 = (' and '.join(query[0]))
             query2 = (' and '.join(query[1]))
-            sql = f"SELECT  id,uuid,amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number FROM assets_log_{int(now_month[0])}  where {query1}  UNION ALL SELECT id,uuid,amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number FROM assets_log_{int(now_month[1])}  where {query2}  ORDER BY id desc limit {(int(page) - 1) * size},{size}"
+            sql = f"SELECT  id,uuid,amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number,amount_type FROM assets_log_{int(now_month[0])}  where {query1}  UNION ALL SELECT id,uuid,amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number,amount_type FROM assets_log_{int(now_month[1])}  where {query2}  ORDER BY id desc limit {(int(page) - 1) * size},{size}"
             once_res = self.linkmysql.query_mysql(sql)
             money_sql = f"SELECT sum(a.b) FROM ("f"SELECT sum(amount) as b FROM assets_log_{int(now_month[0])}  where {(' and '.join(query[0]))} UNION ALL SELECT sum(amount)FROM assets_log_{int(now_month[1])}  where {(' and '.join(query[1]))})  AS a "
             moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(a.b)") if \

app/api/statement/views.py

@@ -31,7 +31,7 @@ def statement_recharge_list(request: Request,db: Session = Depends(get_db),page:
 
 @router.post("/derive/excel")
 def statement_derive_excel(request:Request,data: schemas.StatementList,db: Session = Depends(get_db),token=Depends(login_required)):
-    """充值报表导出  需要修改"""
+    """充值报表导出"""
     header_list = request.get("headers")
     statement_list = RechargeStatement().get_statements(db,data)
     field_list = ["uuid", "充值金额（远）", "支付时间", "类型", "订单号"]