Merge branch 'dev'

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -1906,7 +1906,22 @@
         <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
             AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
         </if>
-        ORDER BY taa.create_date DESC
+        UNION
+        SELECT
+        tmb.dept AS 'deptName',
+        tm.`name` AS 'resourceName',
+        '青岛市大数据发展管理局' AS 'resourceDeptName',
+        '会议室' AS 'type',
+        tm.create_date AS 'createDate',
+        tmb.state AS 'approveStatus',
+        '' AS 'applyNumber'
+        FROM
+        t_meetingroom_book tmb,
+        t_meetingroom tm
+        WHERE
+        tmb.room_id = tm.id
+
+        ORDER BY createDate DESC
     </select>
 
     <select id="selectCollectList" resultType="java.util.Map">