优化查询

app/api/export/crud.py

@@ -17,9 +17,9 @@ def get_export_list(db: Session, param):
     if param.get("source"):
         export_filters.append(ExportFile.source == param.get("source"))
     if param.get("start_time"):
-        export_filters.append(ExportFile.create_time >= param.get("start_time"))
+        export_filters.append(ExportFile.create_time >= param.get("start_time") + " 00:00:00")
     if param.get("end_time"):
-        export_filters.append(ExportFile.create_time <= param.get("end_time"))
+        export_filters.append(ExportFile.create_time < param.get("end_time") + " 24:00:00")
     querydata, count = QueryAllData(db, ExportFile, param, export_filters).query_data()
     data = [QueryAllData.serialization(item) for item in querydata]
     return data, count
@@ -199,4 +199,5 @@ class MonthDataDerive(object):
             }
             self.derive_key.append(res["reference_type"])
             self.derive_list.append(a)
-        return self.data_to_table(self.derive_list)
+
+        return self.derive_list

app/api/export/views.py

 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from fastapi import Depends, APIRouter
+from fastapi import Depends, APIRouter, Request
 from sqlalchemy.orm import Session
 from app import get_db
 from app.api.export import schemas, crud
+from app.api.statement import crud as statement_crud
 from libs.result_format import HttpResultResponse, HttpMessage
 from libs.token_verify import login_required
 
@@ -72,9 +73,11 @@ def month_query_error_data(param: schemas.MonthDetails, token=Depends(login_requ
 
 
 @router.post("/month")
-def month_to_export(param: schemas.MonthStatistics, token=Depends(login_required)):
+def month_to_export(param: schemas.MonthStatistics, request: Request, token=Depends(login_required),
+                    db: Session = Depends(get_db)):
     """月度表导出"""
+    headers = request.get("headers")
     if not param.date:
         return HttpResultResponse(msg='查询月份不能为空')
     result = crud.MonthDataDerive().derive_data('assets_log_' + param.date, param.type)
-    return result
+    return statement_crud.data_to_file(db, result, "业务类型汇总", headers)