|
|
@@ -80,7 +80,8 @@
|
|
80
|
80
|
AND g.`status` > 0
|
|
81
|
81
|
AND g.is_first_time = 1
|
|
82
|
82
|
AND h.phone is not null
|
|
83
|
|
- ) as new_customers
|
|
|
83
|
+ ) as new_customers,
|
|
|
84
|
+ a.activityName
|
|
84
|
85
|
|
|
85
|
86
|
from (
|
|
86
|
87
|
<if test=" type == 'activity' ">
|
|
|
@@ -90,7 +91,8 @@
|
|
90
|
91
|
s.building_name,
|
|
91
|
92
|
t.dynamic_id AS target_id,
|
|
92
|
93
|
t.title AS target_name,
|
|
93
|
|
- 'activity' AS target_type
|
|
|
94
|
+ 'activity' AS target_type,
|
|
|
95
|
+ t.title as activityName
|
|
94
|
96
|
FROM
|
|
95
|
97
|
ta_building_dynamic t
|
|
96
|
98
|
LEFT JOIN ta_building s ON s.building_id = t.building_id
|
|
|
@@ -106,7 +108,8 @@
|
|
106
|
108
|
s.building_name,
|
|
107
|
109
|
t.drainage_id AS target_id,
|
|
108
|
110
|
t.`name` AS target_name,
|
|
109
|
|
- 'h5' AS target_type
|
|
|
111
|
+ 'h5' AS target_type,
|
|
|
112
|
+ t.name as activityName
|
|
110
|
113
|
FROM
|
|
111
|
114
|
ta_drainage t
|
|
112
|
115
|
LEFT JOIN ta_building s ON s.building_id = t.building_id
|
|
|
@@ -122,7 +125,8 @@
|
|
122
|
125
|
s.building_name,
|
|
123
|
126
|
t.help_activity_id AS target_id,
|
|
124
|
127
|
t.title AS target_name,
|
|
125
|
|
- 'help' AS target_type
|
|
|
128
|
+ 'help' AS target_type,
|
|
|
129
|
+ t.title as activityName
|
|
126
|
130
|
FROM
|
|
127
|
131
|
ta_help_activity t
|
|
128
|
132
|
LEFT JOIN ta_building s ON s.building_id = t.building_id
|
|
|
@@ -138,7 +142,8 @@
|
|
138
|
142
|
s.building_name,
|
|
139
|
143
|
t.group_activity_id AS target_id,
|
|
140
|
144
|
t.activity_name AS target_name,
|
|
141
|
|
- 'group' AS target_type
|
|
|
145
|
+ 'group' AS target_type,
|
|
|
146
|
+ t.activity_name as activityName
|
|
142
|
147
|
FROM
|
|
143
|
148
|
ta_share_activity t
|
|
144
|
149
|
LEFT JOIN ta_building s ON s.building_id = t.building_id
|
|
|
@@ -154,7 +159,8 @@
|
|
154
|
159
|
s.building_name,
|
|
155
|
160
|
t.live_activity_id AS target_id,
|
|
156
|
161
|
t.live_activity_title AS target_name,
|
|
157
|
|
- 'live' AS target_type
|
|
|
162
|
+ 'live' AS target_type,
|
|
|
163
|
+ t.live_activity_title as activityName
|
|
158
|
164
|
FROM
|
|
159
|
165
|
ta_live_activity t
|
|
160
|
166
|
LEFT JOIN ta_building s ON s.building_id = t.building_id
|
