|
@@ -80,7 +80,8 @@
|
|
|
a.accountname as "accountname",
|
|
a.accountname as "accountname",
|
|
|
a.invoiceamount as "invoiceamount",
|
|
a.invoiceamount as "invoiceamount",
|
|
|
a.state as "state",
|
|
a.state as "state",
|
|
|
- (select label from pay_sys_dict where type = '票据状态' and value = a.state and site_id = #{siteId} and customer_id = #{customerId}) stateLabel,
|
|
|
|
|
|
|
+ (select label from pay_sys_dict where type = '票据状态' and value = a.state
|
|
|
|
|
+ and tenant_id=#{tenantId}) stateLabel,
|
|
|
a.create_date as "createDate",
|
|
a.create_date as "createDate",
|
|
|
(select name from sc_user where id=a.create_by) as "createByName",
|
|
(select name from sc_user where id=a.create_by) as "createByName",
|
|
|
a.canceltime as "canceltime",
|
|
a.canceltime as "canceltime",
|
|
@@ -155,6 +156,7 @@
|
|
|
invoice_id as "invoiceId",
|
|
invoice_id as "invoiceId",
|
|
|
accountname,
|
|
accountname,
|
|
|
accountnumber,
|
|
accountnumber,
|
|
|
|
|
+ tenant_id,
|
|
|
company_org_id,
|
|
company_org_id,
|
|
|
dept_org_id
|
|
dept_org_id
|
|
|
from pay_pay_transactiondetails
|
|
from pay_pay_transactiondetails
|
hym