魏超 пре 5 година
родитељ
комит
0902b98f43
1 измењених фајлова са 7 додато и 6 уклоњено
  1. 7
    6
      src/main/resources/mapper/HelpActivityMapper.xml

+ 7
- 6
src/main/resources/mapper/HelpActivityMapper.xml Прегледај датотеку

72
                 a.end_date as endDate,
72
                 a.end_date as endDate,
73
                 a.`status` as status,
73
                 a.`status` as status,
74
                 a.activity_status as activityStatus,
74
                 a.activity_status as activityStatus,
75
-				"help" AS type
75
+				"help" AS type,
76
+                a.heavy
76
 			FROM
77
 			FROM
77
 				ta_help_activity a
78
 				ta_help_activity a
78
 				WHERE
79
 				WHERE
86
                 <if test="buildingId != null and buildingId != ''">
87
                 <if test="buildingId != null and buildingId != ''">
87
                   and a.building_id = #{buildingId}
88
                   and a.building_id = #{buildingId}
88
                 </if>
89
                 </if>
89
-                 order  by a.heavy desc
90
 		)
90
 		)
91
 		UNION ALL
91
 		UNION ALL
92
 			(
92
 			(
99
                     s.end_time as endDate,
99
                     s.end_time as endDate,
100
                     s.status as status,
100
                     s.status as status,
101
                     s.activity_status as activityStatus,
101
                     s.activity_status as activityStatus,
102
-					"group" AS type
102
+					"group" AS type,
103
+                    s.heavy
103
 				FROM
104
 				FROM
104
 					ta_share_activity s
105
 					ta_share_activity s
105
 					WHERE
106
 					WHERE
113
                 <if test="buildingId != null and buildingId != ''">
114
                 <if test="buildingId != null and buildingId != ''">
114
                     and s.building_id = #{buildingId}
115
                     and s.building_id = #{buildingId}
115
                 </if>
116
                 </if>
116
-                order  by s.heavy desc
117
 			)
117
 			)
118
 		UNION ALL
118
 		UNION ALL
119
 		    (
119
 		    (
126
                 t.end_date as endDate,
126
                 t.end_date as endDate,
127
                 t.status as status,
127
                 t.status as status,
128
                 t.activity_status as activityStatus,
128
                 t.activity_status as activityStatus,
129
-                "activity" AS type
129
+                "activity" AS type,
130
+                t.heavy
130
                 FROM
131
                 FROM
131
                 ta_building_dynamic t
132
                 ta_building_dynamic t
132
                 WHERE
133
                 WHERE
140
                 <if test="buildingId != null and buildingId != ''">
141
                 <if test="buildingId != null and buildingId != ''">
141
                     and t.building_id = #{buildingId}
142
                     and t.building_id = #{buildingId}
142
                 </if>
143
                 </if>
143
-                order  by t.heavy desc
144
             )
144
             )
145
+            order by heavy
145
     </select>
146
     </select>
146
 
147
 
147
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">
148
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">