u

code/allapp/allapp-go/db/queries/finance_record.sql

@@ -4,16 +4,14 @@ SELECT
     su.member_name
 FROM finance_record fr
          LEFT JOIN space_member su
-                   ON fr.space_id = su.space_id
-                       AND fr.update_by = su.user_id
+             ON fr.space_id = su.space_id AND fr.update_by = su.user_id
+        LEFT JOIN finance_category_space fcs ON fr.category_id = fcs.id
 WHERE
     fr.space_id = $1
   AND fr.record_time >= $2
   AND fr.record_time < $3
-  AND (
-    $4 = 0
-        OR fr.category_id = $4
-    )
+  AND fr.category_id = COALESCE(NULLIF($4::bigint, 0), fr.category_id)
+  AND fcs.type       = COALESCE(NULLIF($5::smallint, 0), fcs.type)
 ORDER BY
     fr.record_time DESC,
     fr.create_time DESC;
@@ -37,4 +35,23 @@ WHERE id = $1;
 DELETE FROM finance_record WHERE id = $1;
 
 -- name: DeleteFinanceRecordByCategoryId :exec
-DELETE FROM finance_record WHERE category_id = $1;
+DELETE FROM finance_record WHERE category_id = $1;
+
+-- name: GetFinanceRecordDetail :one
+SELECT
+    fr.id,
+    fr.category_id,
+    fr.amount,
+    fr.record_time,
+    fr.remark,
+    fr.create_by,
+    fr.create_time,
+    cm.nickname AS create_member_name,
+    fr.update_by,
+    fr.update_time,
+    um.nickname AS update_member_name
+FROM finance_record fr
+         LEFT JOIN "user" cm ON cm.id = fr.create_by
+         LEFT JOIN "user" um ON um.id = fr.update_by
+WHERE fr.id = $1
+LIMIT 1;