From 951c0fec0677c0b2c886178a873fe76e7dc82987 Mon Sep 17 00:00:00 2001 From: lujiang Date: Tue, 27 May 2025 20:16:27 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E8=AE=B0=E5=BD=95=E6=8E=92=E5=BA=8F=EF=BC=9B=20?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E3=80=81=E5=BE=85=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=EF=BC=9A=20=E6=97=A5=E6=9C=9F=E6=AD=A3=E5=BA=8F=EF=BC=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AD=A3=E5=BA=8F=EF=BC=8C=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=AD=A3=E5=BA=8F=EF=BC=9B=E5=85=B6=E4=BB=96?= =?UTF-8?q?=EF=BC=9A=E6=97=A5=E6=9C=9F=E5=80=92=E5=BA=8F=EF=BC=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=AD=A3=E5=BA=8F=EF=BC=8C=E4=BC=9A=E8=AE=AE=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E6=AD=A3=E5=BA=8F=E3=80=82=202=E3=80=81=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=BC=80=E5=A7=8B=E5=89=8D=E6=8F=90=E9=86=92=202?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=8F=90=E5=89=8D?= =?UTF-8?q?1=E5=B0=8F=E6=97=B6=E3=80=82=203=E3=80=81=E5=90=91=E9=9F=B3?= =?UTF-8?q?=E6=8E=A7=E4=BA=BA=E5=91=98=E5=92=8C=E6=9C=8D=E5=8A=A1=E4=BA=BA?= =?UTF-8?q?=E5=91=98=20=E5=8F=91=E9=80=81=E4=BC=9A=E8=AE=AE=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E5=89=8D=E6=8F=90=E9=86=92=EF=BC=8C=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingReservationController.java | 8 +++++ .../impl/IMeetingStatsServiceImpl.java | 15 ++++---- .../impl/MeetingReservationServiceImpl.java | 19 ++++++++++ .../mapper/admin/MeetingReservationMapper.xml | 36 +++++++++---------- .../mapper/admin/MeetingStatsMapper.xml | 4 +-- .../system/handlers/MyParkLineHandler.java | 2 +- .../system/handlers/MyTenantLineHandler.java | 2 +- .../src/main/resources/application-dev.yml | 2 +- 8 files changed, 57 insertions(+), 31 deletions(-) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java index 3838bb1..9ac32b7 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java @@ -434,6 +434,7 @@ public class MeetingReservationController extends BaseController { * capacityNum，容纳人数，精确查询 * status，预约状态，精确查询 * filterDate，预约日期查询，以预约开始时间为准；查询指定日期的所有预约。 + * startDate,endDate 日期范围筛选，成对出现 * sort,排序， create 以创建时间倒序排列；start 以预约会议开始时间倒序排列（默认） * */ @@ -443,6 +444,13 @@ public class MeetingReservationController extends BaseController { startPage(); Long userId = getLoginStaffId(); meetingRecordVo.setUserId(userId); + if (StringUtils.isNotBlank(meetingRecordVo.getStartDate()) && StringUtils.isNotBlank(meetingRecordVo.getEndDate()) && meetingRecordVo.getStartDate().length() == 10 && meetingRecordVo.getEndDate().length() == 10) { + meetingRecordVo.setStartDate(meetingRecordVo.getStartDate() + " 00:00:00"); + meetingRecordVo.setEndDate(meetingRecordVo.getEndDate() + " 23:59:59"); + } else { + meetingRecordVo.setStartDate(null); + meetingRecordVo.setEndDate(null); + } return result(meetingReservationService.selectMeetingReservationList(meetingRecordVo)); } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java index 9f1965c..8fd53a2 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java @@ -1,6 +1,5 @@ package com.ics.admin.service.impl; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ics.admin.mapper.MeetingStatsMapper; import com.ics.admin.service.IMeetingStatsService; @@ -104,20 +103,20 @@ public class IMeetingStatsServiceImpl implements IMeetingStatsService { List y = new ArrayList<>(); List zs = new ArrayList<>(); List list = meetingStatsMapper.roomRankStats(start, end); - - System.out.println("会议室使用排名原始数据: " + list.size() + "条"); + +// System.out.println("会议室使用排名原始数据: " + list.size() + "条"); for (MRStatsVo mrStatsVo : list) { - System.out.println("会议室: " + mrStatsVo.getName() + - ", 楼层: " + mrStatsVo.getFloor() + - ", 房间号: " + mrStatsVo.getRoomNum() + - ", 使用次数: " + mrStatsVo.getValue()); +// System.out.println("会议室: " + mrStatsVo.getName() + +// ", 楼层: " + mrStatsVo.getFloor() + +// ", 房间号: " + mrStatsVo.getRoomNum() + +// ", 使用次数: " + mrStatsVo.getValue()); y.add(mrStatsVo.getName()); zs.add(mrStatsVo.getValue()); } roomRank.put("y", y); roomRank.put("total", zs); map.put("roomRank", roomRank); - System.out.println("处理后的会议室使用排名数据: y=" + y + ", total=" + zs); +// System.out.println("处理后的会议室使用排名数据: y=" + y + ", total=" + zs); } if (true) {//服务情况 List> serve = new ArrayList<>(); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java index ac7938c..cb6938b 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java @@ -22,6 +22,7 @@ import com.ics.admin.utils.MeetingRemindContent; import com.ics.admin.utils.MrOperate; import com.ics.admin.vo.MeetingRecordVo; import com.ics.admin.vo.MeetingRoomVo; +import com.ics.admin.vo.MeetingWaiterVo; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.utils.DateUtils; import com.ics.common.utils.StringUtils; @@ -358,6 +359,15 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService String.format(meetingRemindContent.getMu2(), remindContent, content), currentUserId, now, "1") ); } + //会议取消服务人员，音控、会务服务都有--start + List waiters = meetingWaiterService.selectMeetingWaiterList(meetingReservation.getId()); + for (MeetingWaiterVo meetingWaiterVo : waiters) { + list.add( + new RepairRemind(1, meetingReservation.getId(), meetingWaiterVo.getUserId(), + String.format(meetingRemindContent.getMu2(), remindContent, content), currentUserId, now, "1") + ); + } + //会议取消服务人员，音控、会务服务都有--end } if (status == 3) {//驳回 list.add( @@ -388,6 +398,15 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService new RepairRemind(1, meetingReservation.getId(), Long.valueOf(meetingReservation.getCreateBy()), String.format(meetingRemindContent.getCu4(), remindContent), currentUserId, now, "1") ); + //会议开始前提醒服务人员，音控、会务服务都有--start + List waiters = meetingWaiterService.selectMeetingWaiterList(meetingReservation.getId()); + for (MeetingWaiterVo meetingWaiterVo : waiters) { + list.add( + new RepairRemind(1, meetingReservation.getId(), meetingWaiterVo.getUserId(), + String.format(meetingRemindContent.getCu4(), remindContent), currentUserId, now, "1") + ); + } + //会议开始前提醒服务人员，音控、会务服务都有--end } return list; } diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml index 0c3b8c9..c74cdbb 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml @@ -97,13 +97,13 @@ @@ -156,11 +156,11 @@ - + diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml index 376d867..1dcb9ea 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml @@ -69,7 +69,7 @@ (select ms.value value,mr.id id from ics_meeting_serve ms,ics_meeting_reservation mr where ms.rid=mr.id and ms.delete_flag=0 and mr.delete_flag=0 and mr.status>7 and mr.start between #{start} and #{end} ) zj on type.dict_value=zj.value - where type.dict_type='mm_service' and type.status=0 group by type.dict_label, type.dict_sort order by type.dict_sort + where type.dict_type='mm_service' and type.status=0 group by type.dict_label order by type.dict_sort ]]> @@ -82,7 +82,7 @@ and mr.status>7 and mr.start between #{start} and #{end}) jl on type.dict_value=jl.typeid where type.dict_type='mm_type' and type.status=0 - group by type.dict_label, type.dict_sort order by type.dict_sort + group by type.dict_label order by type.dict_sort ]]> diff --git a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java index 80d3b71..70b5abc 100644 --- a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java +++ b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyParkLineHandler.java @@ -25,7 +25,7 @@ public class MyParkLineHandler implements TenantLineHandler { "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff","ics_customer","tb_customer_ticket","tb_reservation","tb_reservation_person", "tb_room_content","tb_room_item","tb_room_item_by_room","tb_room_serve_by_room","tb_room_serve","tb_equipment","tb_staff_customer", "tb_room_equipment","tb_room_record","tb_room_serve","tb_showroom","tb_showroom_record","tb_ticket","tb_user_equipment","tb_visitor_person", - "ics_repair","ics_repair_remind","ics_repair_address_floor","ics_meeting_reservation","ics_meeting_room" + "ics_repair","ics_repair_remind","ics_repair_address_floor","ics_meeting_reservation","ics_meeting_room","ics_meeting_waiter" }; /** diff --git a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java index 359e66b..58a7afa 100644 --- a/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java +++ b/shoot-hand/ics-system/src/main/java/com/ics/system/handlers/MyTenantLineHandler.java @@ -25,7 +25,7 @@ public class MyTenantLineHandler implements TenantLineHandler { "ics_apply_settle_file", "ics_apply_move_in_file", "ics_activity","ics_customer_staff","ics_customer","tb_customer_ticket","tb_reservation","tb_reservation_person", "tb_room_content","tb_room_item","tb_room_item_by_room","tb_room_serve_by_room","tb_room_serve","tb_equipment","tb_staff_customer", "tb_room_equipment","tb_room_record","tb_room_serve","tb_showroom","tb_showroom_record","tb_ticket","tb_user_equipment","tb_visitor_person", - "ics_repair","ics_repair_remind","ics_repair_address_floor","ics_meeting_reservation","ics_meeting_room" + "ics_repair","ics_repair_remind","ics_repair_address_floor","ics_meeting_reservation","ics_meeting_room","ics_meeting_waiter" }; /** diff --git a/shoot-hand/ics-web/src/main/resources/application-dev.yml b/shoot-hand/ics-web/src/main/resources/application-dev.yml index 20b854d..06f1ada 100644 --- a/shoot-hand/ics-web/src/main/resources/application-dev.yml +++ b/shoot-hand/ics-web/src/main/resources/application-dev.yml @@ -20,7 +20,7 @@ spring: # url: jdbc:mysql://192.168.0.50:3306/dbd-meeting?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: boyuekeji2023 - url: jdbc:mysql://222.184.49.22:3306/shoot-hand?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://222.184.49.22:3306/shoot-hand-prod?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: boyue1!Z # 从库数据源