|
|
@@ -3,21 +3,21 @@
|
|
3
|
3
|
<mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
|
|
4
|
4
|
|
|
5
|
5
|
<select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
|
|
6
|
|
- SELECT dynamic_id as id,list_img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type
|
|
|
6
|
+ SELECT dynamic_id as id,list_img_url as main_img,title,start_date as start_date,enlist_end as end_date,heavy as weight,activity_status,'dynamic' as type
|
|
7
|
7
|
FROM ta_building_dynamic
|
|
8
|
8
|
WHERE org_id = #{orgId} and `status` = #{status}
|
|
9
|
9
|
<if test="cityId != null and cityId != ''">
|
|
10
|
10
|
and city_id = #{cityId}
|
|
11
|
11
|
</if>
|
|
12
|
12
|
UNION all
|
|
13
|
|
- SELECT group_activity_id as id,list_img as main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type
|
|
|
13
|
+ SELECT group_activity_id as id,list_img as main_img,activity_name as title,start_time as start_date,end_time as end_date,heavy as weight,activity_status,'group' as type
|
|
14
|
14
|
from ta_share_activity
|
|
15
|
15
|
WHERE org_id = #{orgId} and `status` = #{status}
|
|
16
|
16
|
<if test="cityId != null and cityId != ''">
|
|
17
|
17
|
and city_id = #{cityId}
|
|
18
|
18
|
</if>
|
|
19
|
19
|
UNION all
|
|
20
|
|
- SELECT help_activity_id as id,list_img as main_img,title,start_date,end_date,weight,activity_status,'help' as type
|
|
|
20
|
+ SELECT help_activity_id as id,list_img as main_img,title,start_date,end_date,heavy as weight,activity_status,'help' as type
|
|
21
|
21
|
from ta_help_activity
|
|
22
|
22
|
WHERE org_id = #{orgId} and `status` = #{status}
|
|
23
|
23
|
<if test="cityId != null and cityId != ''">
|
