From b0182731bdecc62931c462fdee3c83debb1f81b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Sun, 30 Aug 2026 15:49:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=9A=E8=AE=AE=E9=80=89=E5=BA=A7?= =?UTF-8?q?=E3=80=81=E4=BB=A3=E8=A1=A8=E9=98=85=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GuildHallMeetingController.java | 35 + .../GuildHallSelectSeatController.java | 15 +- .../teachercongress/delegate/read/index.html | 506 ++++++- .../guildhall/selectSeat/index.html | 1160 ++++++++++++++--- .../guildhall/selectSeat/list.html | 612 +++++++++ 5 files changed, 2098 insertions(+), 230 deletions(-) create mode 100644 src/main/resources/views/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/list.html diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java index 6f9b3dae..ca030775 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java @@ -3,6 +3,7 @@ package com.budwk.app.zhgh.democratic.teachercongress.guildhall.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; @@ -126,4 +127,38 @@ public class GuildHallMeetingController { } return Result.success(results); } + + @At + @SaCheckPermission("h5.guildHall.metting") + @ApiOperation("H5进行中会议分页") + public Result selectPage(PageForm pageForm) { + int pageNumber = pageForm.getPageNumber() == null ? 1 : pageForm.getPageNumber(); + int pageSize = 10; + Cnd cnd = Cnd.where(GuildHallMeeting::getStartTime, "<=", DateUtil.date()) + .and(GuildHallMeeting::getEndTime, ">=", DateUtil.date()); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + cnd.and(GuildHallMeeting::getName, "like", "%" + pageForm.getSearchKeyword().trim() + "%"); + } + cnd.desc(GuildHallMeeting::getStartTime); + + List availableMeetings = new ArrayList<>(); + List meetings = dao.query(GuildHallMeeting.class, cnd); + for (GuildHallMeeting meeting : meetings) { + if (meeting.getGroupId() != null + && !activityBasicScopeService.isUserInGroup(meeting.getGroupId(), SecurityUtil.getUserId())) { + continue; + } + NutMap meetingMap = Lang.obj2nutmap(meeting); + GuildHall hall = dao.fetch(GuildHall.class, meeting.getHallId()); + meetingMap.put("address", hall == null ? null : hall.getAddress()); + availableMeetings.add(meetingMap); + } + + int totalCount = availableMeetings.size(); + int fromIndex = Math.min((pageNumber - 1) * pageSize, totalCount); + int toIndex = Math.min(fromIndex + pageSize, totalCount); + Pagination pagination = new Pagination<>(pageNumber, pageSize, totalCount, + availableMeetings.subList(fromIndex, toIndex)); + return Result.success(pagination); + } } diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSelectSeatController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSelectSeatController.java index 9ddf6cb3..c15e64a8 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSelectSeatController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallSelectSeatController.java @@ -1,6 +1,7 @@ package com.budwk.app.zhgh.democratic.teachercongress.guildhall.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import com.budwk.app.base.result.Result; import com.budwk.app.web.commons.auth.utils.SecurityUtil; import com.budwk.app.zhgh.activity.basic.service.ActivityBasicScopeService; @@ -49,14 +50,14 @@ public class GuildHallSelectSeatController { } @At("/h5") - @SaCheckPermission("h5.guildHall.selectSeat") + @SaCheckPermission(value = {"h5.guildHall.metting", "h5.guildHall.selectSeat"}, mode = SaMode.OR) @Ok("beetl:/platform/zhghh5/democratic/teachercongress/guildhall/selectSeat/index.html") public void h5Index() { } - @At - @SaCheckPermission("guildHall.selectSeat") - public Result loadSeats(@Param("meetingId") String meetingId) { + @At + @SaCheckPermission(value = {"guildHall.selectSeat", "h5.guildHall.metting"}, mode = SaMode.OR) + public Result loadSeats(@Param("meetingId") String meetingId) { Result permissionResult = checkMeetingPermission(meetingId); if (permissionResult != null) { return permissionResult; @@ -87,10 +88,10 @@ public class GuildHallSelectSeatController { return Result.success(selectedSeats); } - @At - @SaCheckPermission("guildHall.selectSeat") + @At + @SaCheckPermission(value = {"guildHall.selectSeat", "h5.guildHall.metting"}, mode = SaMode.OR) @Aop(TransAop.READ_COMMITTED) - public Result doSelect(@Param("meetingId") String meetingId, Integer rowNumber, Integer colNumber) { + public Result doSelect(@Param("meetingId") String meetingId, Integer rowNumber, Integer colNumber) { Result permissionResult = checkMeetingPermission(meetingId); if (permissionResult != null) { return permissionResult; diff --git a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html index 5879c88d..93e8400d 100644 --- a/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html +++ b/src/main/resources/views/platform/zhghh5/democratic/teachercongress/delegate/read/index.html @@ -2,63 +2,465 @@ layout("/layouts/platform_h5.html"){ #--> -
- - - - - - + + +
+
+ + +
+
+ 代表阅览插画 +
+
代表阅览
+
查阅教代会代表信息
+
+
+ + +
+ + + + - - + +
+
-
- - 导出Excel - - - 导出Word - -
- - - - - +
+ +
+ + 导出Excel + + + 导出Word + +
+
+ +