统计出账和入账账

app/api/export/crud.py

@@ -140,14 +140,24 @@ class CalculationMonthlyDetails(object):
         result = LinkMysql(db).query_mysql(sql)
         return len(result)
 
+    @staticmethod
+    def calculation_total(db, date, reference_type, is_out):
+        sql = f"SELECT sum(amount)/1000 as amount FROM {date} where reference_type='{reference_type}' and type={is_out}"
+        result = LinkMysql(db).query_mysql(sql)
+        return result
+
     def statement_income_expenditure(self, **param):
 
-        with ThreadPoolExecutor(max_workers=2) as pool:
+        with ThreadPoolExecutor(max_workers=3) as pool:
             future1 = pool.submit(self.data_query, env.DB_HISTORY, 'assets_log_' + param.get("date"), param.get("key"), param.get("is_income"), param.get("page"), param.get("size"))
             future2 = pool.submit(self.acquired_total, env.DB_HISTORY, 'assets_log_' + param.get("date"), param.get("key"), param.get("is_income"))
+            future3 = pool.submit(self.calculation_total, env.DB_HISTORY, 'assets_log_' + param.get("date"), param.get("key"), param.get("is_income"))
         data = future1.result()
         num = future2.result()
-        return data, num
+        total = future3.result()
+        if data:
+            return data, num, float(total[0]['amount'])
+        return [], 0, 0
 
     @staticmethod
     def query_error_data(date, reference_type):

app/api/export/views.py

@@ -75,8 +75,8 @@ def month_query_total_export(key: str,
     """月度计算,详情"""
     if not date:
         return HttpResultResponse(code=500, msg='查询月份不能为空')
-    result, num = crud.CalculationMonthlyDetails().statement_income_expenditure(key=key, is_income=is_income, page=page, size=size, date=date)
-    return HttpResultResponse(total=num, data=result)
+    result, total, count = crud.CalculationMonthlyDetails().statement_income_expenditure(key=key, is_income=is_income, page=page, size=size, date=date)
+    return HttpResultResponse(total=total, data=result, count=count)
 
 
 @router.post("/error/data")