|
@@ -64,6 +64,7 @@
|
|
amount,
|
|
amount,
|
|
create_time,
|
|
create_time,
|
|
NULL AS contractCode,
|
|
NULL AS contractCode,
|
|
|
|
+ code,
|
|
10 as type,
|
|
10 as type,
|
|
NULL AS remark
|
|
NULL AS remark
|
|
FROM sale_quotation sq
|
|
FROM sale_quotation sq
|
|
@@ -73,6 +74,7 @@
|
|
amount,
|
|
amount,
|
|
create_time,
|
|
create_time,
|
|
code as contractCode,
|
|
code as contractCode,
|
|
|
|
+ null as code,
|
|
20 as type,
|
|
20 as type,
|
|
NULL AS remark
|
|
NULL AS remark
|
|
FROM contract c
|
|
FROM contract c
|
|
@@ -80,7 +82,7 @@
|
|
and c.buy_corporation_id = #{id})
|
|
and c.buy_corporation_id = #{id})
|
|
UNION
|
|
UNION
|
|
(SELECT id,
|
|
(SELECT id,
|
|
- NULL AS amount, date AS create_time, NULL AS contractCode, 30 AS type, content AS remark
|
|
|
|
|
|
+ NULL AS amount, date AS create_time, NULL AS contractCode, null as code, 30 AS type, content AS remark
|
|
FROM
|
|
FROM
|
|
bytesailing_customer.customer_follow_records cfr
|
|
bytesailing_customer.customer_follow_records cfr
|
|
where cfr.customer_id = #{id}
|
|
where cfr.customer_id = #{id}
|