优化业务汇总条件导出

app/api/export/crud.py

@@ -176,17 +176,21 @@ class MonthDataDerive(object):
         return StreamingResponse(file, media_type='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
 
     def derive_data(self, date, key_type, name):
-        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"
-        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"
+        assert_list = []
+        if name:
+            k_list = []
             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:
+                if v == name or name in v:
+                    k_list.append(k)
+            if len(k_list) > 1:
+                assert_list.append(f" reference_type in{tuple(k_list)}")
+            if len(k_list) == 1:
+                assert_list.append(f" reference_type='{k_list[0]}'")
+        if key_type:
+            assert_list.append(f" reference_type like '%{key_type}%'")
+        if assert_list:
+            sql = f"SELECT reference_type, type, SUM(cast(amount as decimal(20,6)))/1000 as money FROM {date} where {' and '.join(assert_list)} GROUP BY reference_type, type ORDER BY reference_type"
+        else:
             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(env.DB_HISTORY).query_mysql(sql)