优化导出

.idea/financial-system.iml

@@ -6,7 +6,7 @@
       <excludeFolder url="file://$MODULE_DIR$/fs-env" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.8 (financial-system)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (financial_system)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (financial-system)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file

app/api/account/crud.py

@@ -453,6 +453,20 @@ class AccountStatistics(object):
             return res
 
 
+def delete_specify_field(data):
+    res_list = []
+    for i in data:
+        structure = {
+            "order_number": i["order_number"],
+            "type": '出账' if i["type"] == 0 else '入账',
+            "reference_type": i["reference_type"],
+            "amount": round(float(i["amount"]), 3),
+            "create_time": i["create_time"]
+        }
+        res_list.append(structure)
+    return res_list
+
+
 class SpecificAccountQuery(object):
     """账户用户，背包，公会第四层查询"""
 

app/api/account/schemas.py

@@ -36,6 +36,7 @@ class AccountUpdate(BaseModel):
 
 class FinanceInfo(PublicModel):
     unique_tag: str
+    id: Optional[int] = None
 
 
 class FinanceDetails(PublicModel):

app/api/account/views.py

@@ -68,8 +68,8 @@ def finance_info_excel(data: schemas.FinanceInfo, request: Request,
                        token=Depends(login_required), db: Session = Depends(get_db)):
     """账户财务详情导出"""
     headers = request.get("headers")
-    statement_list = crud.get_finance_info(data.unique_tag, data.page, 99999, data.start_time, data.end_time)
-    df = ['表id', '金额', '入账', '出账', '时间']
+    statement_list = crud.get_finance_info(data.unique_tag, data.id, data.page, 99999, data.start_time, data.end_time)
+    df = ['账户余额', '入账', '出账', '时间']
     return statement_crud.data_to_file(db, statement_list, "财务信息", headers, df)
 
 
@@ -99,8 +99,9 @@ def finance_info_excel(data: schemas.FinanceDetails, request: Request,
     headers = request.get("headers")
     statement_list = AccountStatistics(data.page, 99999, data.uuid, data.user_id, data.start_time, data.end_time, data.type,
                                        data.gift_type, data.unique_tag).get_finance_details()
+    data = crud.delete_specify_field(statement_list)
     field_head = ['订单号', '出入账方式', '礼物类型', '金额', '时间']
-    return statement_crud.data_to_file(db, statement_list, "财务明细", headers, field_head)
+    return statement_crud.data_to_file(db, data, "财务明细", headers, field_head)
 
 
 @router.get("/finance/fourth/details")