u

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

@@ -1,11 +1,6 @@
 -- name: FindUserMoneyRecords :many
-SELECT
-    mr.*,
-    muc.name AS category_name,
-    muc.icon AS category_icon,
-    muc.type AS category_type
+SELECT mr.*
 FROM money_record mr
-         LEFT JOIN money_user_category muc ON mr.category_id = muc.id
 WHERE mr.user_id = $1
   AND mr.record_time BETWEEN $2 AND $3
 ORDER BY mr.record_time DESC, mr.create_time DESC;
@@ -13,17 +8,17 @@ ORDER BY mr.record_time DESC, mr.create_time DESC;
 -- name: FindMoneyRecordsBySpace :many
 SELECT
     mr.*,
-    u.username AS username,
-    muc.name AS category_name,
-    muc.icon AS category_icon,
-    muc.type AS category_type
+    u.username AS username
 FROM money_record mr
-         LEFT JOIN money_user_category muc ON mr.category_id = muc.id
-         INNER JOIN space_user su ON mr.user_id = su.user_id AND su.space_id = $1
-         LEFT JOIN user_info u ON mr.user_id = u.id
+         INNER JOIN space_user su
+                    ON mr.user_id = su.user_id
+                        AND su.space_id = $1
+         LEFT JOIN user_info u
+                   ON mr.user_id = u.id
 WHERE mr.record_time BETWEEN $2 AND $3
 ORDER BY mr.record_time DESC, mr.create_time DESC;
 
+
 -- name: InsertMoneyRecord :one
 INSERT INTO money_record (
     id,

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

@@ -21,10 +21,10 @@ DELETE FROM money_user_category
 WHERE user_id = $1;
 
 -- name: InsertMoneyUserCategory :exec
-INSERT INTO money_user_category (id, user_id, name, icon, type, sort_number)
-VALUES ($1, $2, $3, $4, $5, $6);
+INSERT INTO money_user_category (id, user_id, name, icon, type, sort_number,create_time,update_time)
+VALUES ($1, $2, $3, $4, $5, $6,NOW(),NOW());
 
 -- name: UpdateMoneyCategory :exec
 UPDATE money_user_category
-SET icon = $2,name = $3
+SET icon = $2,name = $3,update_time = NOW()
 WHERE id = $1;