|
|
@@ -60,7 +60,9 @@
|
|
|
p.area_name as "project.county",
|
|
|
a.receipt_money_date as "receiptMoneyDate",
|
|
|
(case when a.receipt_money = '0' then '否' when a.receipt_money = '1' then '是' else '否' end) as receiptMoney,
|
|
|
- a.cancellation_remark as "cancellationRemark"
|
|
|
+ a.cancellation_remark as "cancellationRemark",
|
|
|
+ a.account_checking_user_id as "accountCheckingUserId",
|
|
|
+ acu.name as "accountCheckingUserName"
|
|
|
</sql>
|
|
|
|
|
|
<sql id="workInvoiceJoins">
|
|
|
@@ -73,6 +75,7 @@
|
|
|
JOIN sys_office o ON o.id = a.office_id
|
|
|
JOIN sys_office s ON s.id = a.company_id
|
|
|
LEFT join sys_office so on so.id = a.office_id
|
|
|
+ left join sys_user acu on acu.id = a.account_checking_user_id
|
|
|
</sql>
|
|
|
|
|
|
|
user5