|
@@ -11,27 +11,27 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findByPaging" parameterType="com.persagy.domain.PagingVO" resultType="com.persagy.domain.ReservationVo">
|
|
|
- SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
|
|
|
+ SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
|
|
|
LEFT JOIN room b on a.room_id=b.id
|
|
|
WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND a.mark='待审核' ORDER BY id
|
|
|
limit #{toPageNo}, #{pageSize}
|
|
|
</select>
|
|
|
|
|
|
<select id="findAllByPaging" parameterType="com.persagy.domain.PagingVO" resultType="com.persagy.domain.ReservationVo">
|
|
|
- SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
|
|
|
+ SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
|
|
|
LEFT JOIN room b on a.room_id=b.id
|
|
|
WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND mark!='取消申请' ORDER BY date DESC
|
|
|
limit #{toPageNo}, #{pageSize}
|
|
|
</select>
|
|
|
|
|
|
<select id="findByName" parameterType="string" resultType="com.persagy.domain.ReservationVo">
|
|
|
- SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
|
|
|
+ SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
|
|
|
LEFT JOIN room b on a.room_id=b.id
|
|
|
WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND a.mark='待审核' AND a.user LIKE '%${value}%' ORDER BY id
|
|
|
</select>
|
|
|
|
|
|
<select id="findByRoomId" parameterType="int" resultType="com.persagy.domain.ReservationVo">
|
|
|
- SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
|
|
|
+ SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
|
|
|
LEFT JOIN room b on a.room_id=b.id
|
|
|
WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND mark!='取消申请' AND a.room_id=#{id} ORDER BY id
|
|
|
</select>
|
|
@@ -41,14 +41,14 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findRecord" parameterType="com.persagy.domain.PagingVO" resultType="com.persagy.domain.ReservationVo">
|
|
|
- SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
|
|
|
+ SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
|
|
|
LEFT JOIN room b on a.room_id=b.id
|
|
|
WHERE date BETWEEN CURDATE()-30 AND CURDATE() AND a.mark='审核通过' ORDER BY id
|
|
|
limit #{toPageNo}, #{pageSize}
|
|
|
</select>
|
|
|
|
|
|
<select id="queryByUser" parameterType="string" resultType="com.persagy.domain.ReservationVo">
|
|
|
- SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark FROM reservation a
|
|
|
+ SELECT a.id,b.`name` ,a.date,a.begintime,a.endtime,a.`user`,a.mobile,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
|
|
|
LEFT JOIN room b on a.room_id=b.id
|
|
|
WHERE date>DATE_SUB(curdate(),INTERVAL 1 DAY) AND a.user LIKE '%${value}%' ORDER BY date DESC
|
|
|
</select>
|
|
@@ -58,12 +58,12 @@
|
|
|
</update>
|
|
|
|
|
|
<insert id="addReservation" parameterType="com.persagy.domain.ReservationCustom">
|
|
|
- INSERT INTO reservation(user,mobile,date,begintime,endtime,mark,room_id)
|
|
|
- SELECT #{user},#{mobile},#{date},#{beginTime},#{endTime},'待审核',id FROM room WHERE name=#{name}
|
|
|
+ INSERT INTO reservation(user,mobile,date,begintime,endtime,mark,room_id,enterUsers,department,theme,alarmminute)
|
|
|
+ SELECT #{user},#{mobile},#{date},#{beginTime},#{endTime},'待审核',id,#{enterUsers},#{department},#{theme},#{alarmminute} FROM room WHERE name=#{name}
|
|
|
</insert>
|
|
|
|
|
|
<select id="findByUser" parameterType="string" resultType="com.persagy.domain.ReservationCustom">
|
|
|
- SELECT a.id,b.name,a.user,a.date,a.begintime,a.endtime,a.mark FROM reservation a
|
|
|
+ SELECT a.id,b.name,a.user,a.date,a.begintime,a.endtime,a.mark,a.enterUsers,a.department,a.theme,a.alarmminute FROM reservation a
|
|
|
LEFT JOIN room b ON a.room_id=b.id
|
|
|
WHERE a.date > CURDATE()-15 AND a.mark='待审核' AND a.user=#{value} ORDER BY a.date DESC
|
|
|
</select>
|