@@ -44,4 +44,9 @@ public class CustomerFollowRecordsVo extends CustomerFollowRecords {
* 跟进人名称
*/
private String followUpUserName;
+
+ /**
+ * 报价单code
+ */
+ private String code;
}
@@ -7,6 +7,7 @@
amount,
create_time `date`,
NULL AS contractCode,
+ code,
10 AS type,
NULL AS content,
create_user
@@ -19,6 +20,7 @@
CODE AS contractCode,
+ null as code,
20 AS type,
@@ -31,6 +33,7 @@
NULL AS amount,
`date`,
30 AS type,
content,
@@ -76,6 +76,7 @@
@@ -88,6 +89,7 @@
@@ -101,6 +103,7 @@
@@ -64,6 +64,7 @@
create_time,
10 as type,
NULL AS remark
FROM sale_quotation sq
@@ -73,6 +74,7 @@
code as contractCode,
20 as type,
FROM contract c
@@ -80,7 +82,7 @@
and c.buy_corporation_id = #{id})
UNION
(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
bytesailing_customer.customer_follow_records cfr
where cfr.customer_id = #{id}