handong/smartservice_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

대시보드, 기기에러, 계정관리 수정

Browse Source
This commit is contained in:
comicgum
2026-09-15 21:52:40 +09:00
parent 4a6c9d2afe
commit d1e230eb6a
32 changed files with 1984 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
smartservice_backend/src/main/resources/mapper/TransactionMapper.xml
+7 -1
View File
@@ -63,11 +63,17 @@
COUNT(*)
</when>
<otherwise>
T.reg_time, T.order_time, D.name AS device_name, T.amount, T.type, T.approval, T.uid1, T.pay_name, T.pay_vendor, T.column_no, T.code, T.goods_name, T.pay_unique_num, T.order_time
T.reg_time, T.order_time, D.name AS device_name, T.amount, T.type, T.approval, T.uid1, T.pay_name, T.pay_vendor, T.column_no, T.code, T.goods_name, T.pay_unique_num, T.order_time,
T.card_num, T.rtid,
/* the original approval, shown under a credit cancel row */
ORG.reg_time AS org_reg_time, ORG.order_time AS org_order_time, ORG.type AS org_type, ORG.amount AS org_amount,
ORG.approval AS org_approval, ORG.card_num AS org_card_num, ORG.pay_name AS org_pay_name, ORG.pay_vendor AS org_pay_vendor,
ORG.column_no AS org_column_no, ORG.code AS org_code, ORG.goods_name AS org_goods_name
</otherwise>
</choose>
FROM transactions AS T
JOIN device D ON T.device_id = D.device_id
LEFT JOIN transactions ORG ON ORG.transaction_id = T.rtid
WHERE
<choose>
<when test='is_group_access == false'>