添加业务汇总，名称查询

app/api/export/crud.py

@@ -72,13 +72,21 @@ class CalculationMonthlyBill(object):
         self.structure_list = []
         self.structure_key = []
 
-    def month_statistics_task(self, date, key_type, page, size):
+    def month_statistics_task(self, date, key_type, name, page, size):
         """主函数"""
         db = env.MysqlDB
         db["database"] = env.DB_HISTORY
-        if key_type:
+        if key_type and not name:
             sql = f"SELECT reference_type, type, SUM(cast(amount as decimal(20,6)))/1000 as money FROM {date} where reference_type='{key_type}' GROUP BY reference_type, type ORDER BY reference_type"
-        else:
+        if name and not key_type:
+            sql = f"SELECT reference_type, type, SUM(cast(amount as decimal(20,6)))/1000 as money FROM {date} where reference_type='{name}' GROUP BY reference_type, type ORDER BY reference_type"
+            for k, v in TYPE_NAME.items():
+                if v == name:
+                    sql = f"SELECT reference_type, type, SUM(cast(amount as decimal(20,6)))/1000 as money FROM {date} where reference_type='{k}' GROUP BY reference_type, type ORDER BY reference_type"
+                    break
+        if name and key_type:
+            sql = f"SELECT reference_type, type, SUM(cast(amount as decimal(20,6)))/1000 as money FROM {date} where reference_type='{key_type}' GROUP BY reference_type, type ORDER BY reference_type"
+        if not name and not key_type:
             sql = f"SELECT reference_type, type, SUM(cast(amount as decimal(20,6)))/1000 as money FROM {date} GROUP BY reference_type, type ORDER BY reference_type"
         try:
             res_data = LinkMysql(db).query_mysql(sql)

app/api/export/schemas.py

@@ -19,6 +19,7 @@ class ExportUpdateData(BaseModel):
 class MonthStatistics(BaseModel):
     date: str = ""
     type: str = ""
+    name: str = ""
     page: int = None
     size: int = None
 

app/api/export/views.py

@@ -49,7 +49,7 @@ def month_query_total_export(param: schemas.MonthStatistics, token=Depends(login
     if not param.date:
         month_date = datetime.now().date() - relativedelta(months=1)
         param.date = month_date.strftime("%Y%m")
-    result, num = crud.CalculationMonthlyBill().month_statistics_task('assets_log_' + param.date, param.type,
+    result, num = crud.CalculationMonthlyBill().month_statistics_task('assets_log_' + param.date, param.type, param.name,
                                                                       param.page, param.size)
     return HttpResultResponse(total=num, data=result)