boyue2025/dbd-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting.git synced 2025-06-21 17:09:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

20250523-预约记录页面1.筛选加日期选择范围,2.前面列表加序号

Browse Source
This commit is contained in:
luoyu 2025-05-23 14:19:35 +08:00
parent 472c137cff
commit 933534dab2
3 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
View File

@ -306,9 +306,9 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService
private List<RepairRemind> processRemind(MeetingReservation meetingReservation, Long currentUserId, String content, Integer status, String voiceWaiter, String serveWaiter) { private List<RepairRemind> processRemind(MeetingReservation meetingReservation, Long currentUserId, String content, Integer status, String voiceWaiter, String serveWaiter) {
MeetingRoomVo meetingRoom = meetingRoomMapper.selectMeetingRoomById(meetingReservation.getRoomId()); MeetingRoomVo meetingRoom = meetingRoomMapper.selectMeetingRoomById(meetingReservation.getRoomId());
String remindContent = DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", meetingReservation.getStart()) String remindContent = DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", meetingReservation.getStart())
+ " ~ " + DateUtils.parseDateToStr("HH:mm", meetingReservation.getEnd()) + " ~ " + DateUtils.parseDateToStr("HH:mm", meetingReservation.getEnd())
+ "/" + meetingReservation.getTitle() + "/" + meetingReservation.getTitle()
+ "/" + meetingRoom.getRoomNum(); + "/" + meetingRoom.getRoomNum();
Date now = new Date(); Date now = new Date();
List<RepairRemind> list = new ArrayList<>(); List<RepairRemind> list = new ArrayList<>();
IcsCustomerStaff p = new IcsCustomerStaff(); IcsCustomerStaff p = new IcsCustomerStaff();

10
shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java
View File

@ -27,6 +27,16 @@ public class MeetingRecordVo implements Serializable {
* 日期查询；格式 2024-09-22 * 日期查询；格式 2024-09-22
*/ */
private String filterDate; private String filterDate;
/**
* 查询起始日期（yyyy-MM-dd）
*/
private String startDate;
/**
* 查询结束日期（yyyy-MM-dd）
*/
private String endDate;
private Long id; private Long id;

37
shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml
View File

@ -41,12 +41,12 @@
<select id="getAllRoomByType" parameterType="com.ics.admin.vo.MeetingRoomVo" resultType="com.ics.admin.vo.MeetingRoomVo"> <select id="getAllRoomByType" parameterType="com.ics.admin.vo.MeetingRoomVo" resultType="com.ics.admin.vo.MeetingRoomVo">
select room.*,case when mr.room_id is null then 0 else 1 end as status from ics_meeting_room room left join select room.*,case when mr.room_id is null then 0 else 1 end as status from ics_meeting_room room left join
( (
select room_id from ics_meeting_reservation where delete_flag = 0 and status &gt; 3 select room_id from ics_meeting_reservation where delete_flag = 0 and status &gt; 3
<if test="type != null and (type == 'going' or type == 'free')"> AND status = 9 </if> <if test="type != null and (type == 'going' or type == 'free')"> AND status = 9 </if>
and start LIKE CONCAT(#{mrdate}, '%') group by room_id and start LIKE CONCAT(#{mrdate}, '%') group by room_id
) mr on mr.room_id=room.id ) mr on mr.room_id=room.id
where where
room.delete_flag=0 room.delete_flag=0
<if test="type != null and (type == 'already' or type == 'going')"> AND mr.room_id is not null</if> <if test="type != null and (type == 'already' or type == 'going')"> AND mr.room_id is not null</if>
<if test="type != null and (type == 'without' or type == 'free')"> AND mr.room_id is null</if> <if test="type != null and (type == 'without' or type == 'free')"> AND mr.room_id is null</if>
<if test="floor != null and floor != ''"> AND room.floor = #{floor}</if> <if test="floor != null and floor != ''"> AND room.floor = #{floor}</if>
@ -74,15 +74,15 @@
where where
room.delete_flag=0 room.delete_flag=0
]]> ]]>
<if test="floor != null and floor != ''"> AND room.floor = #{floor}</if> <if test="floor != null and floor != ''"> AND room.floor = #{floor}</if>
<if test="name != null and name != ''"> AND room.name LIKE CONCAT('%', #{name}, '%')</if> <if test="name != null and name != ''"> AND room.name LIKE CONCAT('%', #{name}, '%')</if>
<if test="typeName != null and typeName != ''"> AND room.type_name = #{typeName}</if> <if test="typeName != null and typeName != ''"> AND room.type_name = #{typeName}</if>
<if test="devices != null"> <if test="devices != null">
<foreach item="dev" collection="devices"> <foreach item="dev" collection="devices">
AND device LIKE CONCAT('%', #{dev}, '%') AND device LIKE CONCAT('%', #{dev}, '%')
</foreach> </foreach>
</if> </if>
<if test="min != null and max !=null"> and room.capacity_num &gt;= #{min} AND room.capacity_num &lt;= #{max}</if> <if test="min != null and max !=null"> and room.capacity_num &gt;= #{min} AND room.capacity_num &lt;= #{max}</if>
order by room_num order by room_num
</select> </select>
@ -97,13 +97,13 @@
<!-- 分页列表 --> <!-- 分页列表 -->
<select id="selectMeetingReservationList" parameterType="com.ics.admin.vo.MeetingRecordVo" resultType="com.ics.admin.vo.MeetingRecordVo"> <select id="selectMeetingReservationList" parameterType="com.ics.admin.vo.MeetingRecordVo" resultType="com.ics.admin.vo.MeetingRecordVo">
SELECT mr.id, sn, room_id, start, `end`, time_format, title, person_num, leader, booking_user_name, booking_user_phone, user_org_id, user_org, status, operate, mr.remark, mr.ext1, mr.ext2, mr.ext3, mr.create_time createTime,mr.update_time updateTime, SELECT mr.id, sn, room_id, start, `end`, time_format, title, person_num, leader, booking_user_name, booking_user_phone, user_org_id, user_org, status, operate, mr.remark, mr.ext1, mr.ext2, mr.ext3, mr.create_time createTime,mr.update_time updateTime,
floor_id, floor, name, type_id, type_name, device, room_num, area, capacity_num, content, enable, room.ext1 roomExt1, room.ext2 roomExt2, room.ext3 roomExt3, room.remark roomRemark floor_id, floor, name, type_id, type_name, device, room_num, area, capacity_num, content, enable, room.ext1 roomExt1, room.ext2 roomExt2, room.ext3 roomExt3, room.remark roomRemark
from ics_meeting_reservation mr inner join ics_meeting_room room on mr.room_id=room.id from ics_meeting_reservation mr inner join ics_meeting_room room on mr.room_id=room.id
<if test="role == 3"> <if test="role == 3">
inner join ics_meeting_waiter wa on mr.id=wa.rid inner join ics_meeting_waiter wa on mr.id=wa.rid
</if> </if>
where where
mr.delete_flag=0 and room.delete_flag=0 mr.delete_flag=0 and room.delete_flag=0
<if test="role == 3"> <if test="role == 3">
and wa.delete_flag=0 and wa.user_id=#{userId} and wa.delete_flag=0 and wa.user_id=#{userId}
</if> </if>
@ -119,7 +119,12 @@
<if test="device != null and device != ''"> AND room.device LIKE CONCAT('%', #{device}, '%')</if> <if test="device != null and device != ''"> AND room.device LIKE CONCAT('%', #{device}, '%')</if>
<if test="capacityNum != null"> AND capacity_num &lt;= #{capacityNum}</if> <if test="capacityNum != null"> AND capacity_num &lt;= #{capacityNum}</if>
<if test="status != null"> AND status = #{status}</if> <if test="status != null"> AND status = #{status}</if>
<if test="filterDate != null and filterDate != ''"> AND start LIKE CONCAT(#{filterDate}, '%')</if> <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
AND (start &gt;= CONCAT(#{startDate}, ' 00:00:00') AND start &lt;= CONCAT(#{endDate}, ' 23:59:59'))
</if>
<if test="filterDate != null and filterDate != '' and (startDate == null or startDate == '')">
AND start LIKE CONCAT(#{filterDate}, '%')
</if>
<if test="ext1 != null and ext1 != ''"> AND mr.ext1 is null</if> <if test="ext1 != null and ext1 != ''"> AND mr.ext1 is null</if>
<choose> <choose>
<when test="sort != null and sort == 'create'"> order by mr.create_time desc,status</when> <when test="sort != null and sort == 'create'"> order by mr.create_time desc,status</when>