傅行帆 5 anos atrás
pai
commit
9b98178cef
1 arquivos alterados com 4 adições e 4 exclusões
  1. 4
    4
      src/main/resources/mapper/Activity.xml

+ 4
- 4
src/main/resources/mapper/Activity.xml Ver arquivo

3
 <mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
3
 <mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
4
 
4
 
5
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
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,heavy as 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, weight,activity_status,'dynamic' as type
7
         FROM ta_building_dynamic
7
         FROM ta_building_dynamic
8
         WHERE org_id = #{orgId}  and `status` = #{status}
8
         WHERE org_id = #{orgId}  and `status` = #{status}
9
         <if test="cityId != null and cityId != ''">
9
         <if test="cityId != null and cityId != ''">
10
           and city_id = #{cityId}
10
           and city_id = #{cityId}
11
         </if>
11
         </if>
12
         UNION  all
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,heavy as 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,weight,activity_status,'group' as type
14
         from ta_share_activity
14
         from ta_share_activity
15
         WHERE org_id = #{orgId} and `status` = #{status}
15
         WHERE org_id = #{orgId} and `status` = #{status}
16
         <if test="cityId != null and cityId != ''">
16
         <if test="cityId != null and cityId != ''">
17
             and city_id = #{cityId}
17
             and city_id = #{cityId}
18
         </if>
18
         </if>
19
         UNION  all
19
         UNION  all
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
20
+        SELECT help_activity_id as id,list_img as main_img,title,start_date,end_date,heavy,weight,activity_status,'help' as type
21
         from ta_help_activity
21
         from ta_help_activity
22
         WHERE org_id = #{orgId} and `status` = #{status}
22
         WHERE org_id = #{orgId} and `status` = #{status}
23
         <if test="cityId != null and cityId != ''">
23
         <if test="cityId != null and cityId != ''">
24
             and city_id = #{cityId}
24
             and city_id = #{cityId}
25
         </if>
25
         </if>
26
-        ORDER BY weight desc,activity_status,start_date
26
+        ORDER BY weight desc,heavy desc,activity_status,start_date
27
     </select>
27
     </select>
28
     <select id="getCustomerActivityList" resultType="java.util.Map">
28
     <select id="getCustomerActivityList" resultType="java.util.Map">
29
         SELECT
29
         SELECT