|
@@ -77,7 +77,7 @@
|
|
create_time `date`,
|
|
create_time `date`,
|
|
NULL AS contractCode,
|
|
NULL AS contractCode,
|
|
10 AS type,
|
|
10 AS type,
|
|
- NULL AS remark
|
|
|
|
|
|
+ NULL AS content
|
|
FROM bytesailing_sale.sale_quotation sq
|
|
FROM bytesailing_sale.sale_quotation sq
|
|
WHERE sq.buy_corporation_id = #{id}
|
|
WHERE sq.buy_corporation_id = #{id}
|
|
and sq.tenant_id = #{tenantId}
|
|
and sq.tenant_id = #{tenantId}
|
|
@@ -88,18 +88,18 @@
|
|
create_time `date`,
|
|
create_time `date`,
|
|
CODE AS contractCode,
|
|
CODE AS contractCode,
|
|
20 AS type,
|
|
20 AS type,
|
|
- NULL AS remark
|
|
|
|
|
|
+ NULL AS content
|
|
FROM bytesailing_sale.contract c
|
|
FROM bytesailing_sale.contract c
|
|
WHERE c.buy_corporation_id = #{id}
|
|
WHERE c.buy_corporation_id = #{id}
|
|
and c.tenant_id = #{tenantId}
|
|
and c.tenant_id = #{tenantId}
|
|
and c.del_flag = 0)
|
|
and c.del_flag = 0)
|
|
UNION
|
|
UNION
|
|
(SELECT id,
|
|
(SELECT id,
|
|
- NULL AS amount,
|
|
|
|
|
|
+ NULL AS amount,
|
|
`date`,
|
|
`date`,
|
|
- NULL AS contractCode,
|
|
|
|
- 30 AS type,
|
|
|
|
- content AS remark
|
|
|
|
|
|
+ NULL AS contractCode,
|
|
|
|
+ 30 AS type,
|
|
|
|
+ content
|
|
FROM customer_follow_records cfr
|
|
FROM customer_follow_records cfr
|
|
WHERE cfr.customer_id = #{id})) t1
|
|
WHERE cfr.customer_id = #{id})) t1
|
|
ORDER BY t1.date DESC LIMIT 3
|
|
ORDER BY t1.date DESC LIMIT 3
|