Merge branch 'feature_教代会代表证' into release_20260831

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallController.java

@@ -7,7 +7,9 @@ import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.param.PageForm;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHall;
+import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallMeeting;
 import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallSeat;
+import com.budwk.app.zhgh.democratic.teachercongress.guildhall.models.GuildHallSeatSelect;
 import com.budwk.app.zhgh.democratic.teachercongress.guildhall.service.GuildHallService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +23,10 @@ import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Api("会议厅管理")
 @IocBean
@@ -114,13 +119,73 @@ public class GuildHallController {
     @ApiOperation("保存座位")
     @Aop(TransAop.READ_COMMITTED)
     public Result saveSeat(String hallId, @Param("seats") GuildHallSeat[] seats) {
+        Date now = new Date();
+        List<GuildHallMeeting> meetings = dao.query(GuildHallMeeting.class,
+                Cnd.where(GuildHallMeeting::getHallId, "=", hallId)
+                        .and(GuildHallMeeting::getEndTime, ">=", now));
+        Map<String, GuildHallSeat> newSeatMap = new HashMap<>();
+        for (GuildHallSeat seat : seats) {
+            newSeatMap.put(seatKey(seat.getRowNumber(), seat.getColNumber()), seat);
+        }
+
+        for (GuildHallMeeting meeting : meetings) {
+            List<GuildHallSeatSelect> meetingSeats = dao.query(GuildHallSeatSelect.class,
+                    Cnd.where("meetingId", "=", meeting.getId()));
+            for (GuildHallSeatSelect meetingSeat : meetingSeats) {
+                GuildHallSeat newSeat = newSeatMap.get(seatKey(meetingSeat.getRowNumber(), meetingSeat.getColNumber()));
+                if (meetingSeat.getUserId() != null
+                        && (newSeat == null || Boolean.FALSE.equals(newSeat.getEnable()))) {
+                    return Result.error("会议“" + meeting.getName() + "”的第" + meetingSeat.getRowNumber()
+                            + "排第" + meetingSeat.getColNumber() + "列已被选择，不能删除或停用");
+                }
+            }
+        }
+
         dao.clear(GuildHallSeat.class, Cnd.where(GuildHallSeat::getHallId, "=", hallId));
         for (GuildHallSeat seat : seats) {
             seat.setHallId(hallId);
         }
         dao.insert(seats);
+
+        for (GuildHallMeeting meeting : meetings) {
+            List<GuildHallSeatSelect> meetingSeats = dao.query(GuildHallSeatSelect.class,
+                    Cnd.where("meetingId", "=", meeting.getId()));
+            Map<String, GuildHallSeatSelect> meetingSeatMap = new HashMap<>();
+            for (GuildHallSeatSelect meetingSeat : meetingSeats) {
+                meetingSeatMap.put(seatKey(meetingSeat.getRowNumber(), meetingSeat.getColNumber()), meetingSeat);
+            }
+
+            for (GuildHallSeat seat : seats) {
+                String key = seatKey(seat.getRowNumber(), seat.getColNumber());
+                GuildHallSeatSelect meetingSeat = meetingSeatMap.remove(key);
+                if (meetingSeat == null) {
+                    meetingSeat = new GuildHallSeatSelect();
+                    meetingSeat.setId(null);
+                    meetingSeat.setHallId(hallId);
+                    meetingSeat.setMeetingId(meeting.getId());
+                    meetingSeat.setRowNumber(seat.getRowNumber());
+                    meetingSeat.setColNumber(seat.getColNumber());
+                    meetingSeat.setSeatNumber(seat.getSeatNumber());
+                    meetingSeat.setEnable(seat.getEnable());
+                    dao.insert(meetingSeat);
+                } else {
+                    meetingSeat.setHallId(hallId);
+                    meetingSeat.setSeatNumber(seat.getSeatNumber());
+                    meetingSeat.setEnable(seat.getEnable());
+                    dao.update(meetingSeat);
+                }
+            }
+
+            for (GuildHallSeatSelect removedSeat : meetingSeatMap.values()) {
+                dao.delete(GuildHallSeatSelect.class, removedSeat.getId());
+            }
+        }
         return Result.success();
     }
 
+    private String seatKey(Integer rowNumber, Integer colNumber) {
+        return rowNumber + "_" + colNumber;
+    }
+
 
 }

src/main/java/com/budwk/app/zhgh/democratic/teachercongress/guildhall/controller/GuildHallMeetingController.java

@@ -1,7 +1,6 @@
 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;
@@ -29,7 +28,11 @@ import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Api("会议厅会议")
 @IocBean
@@ -63,6 +66,29 @@ public class GuildHallMeetingController {
         return Result.success(pagination);
     }
 
+    @At
+    @SaCheckPermission("guildHall.meeting")
+    @ApiOperation("会议厅已占用时间列表")
+    public Result occupiedTimes(PageForm pageForm, String hallId, Date startTime, Date endTime, Boolean includeFree) {
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX(GuildHallMeeting::getHallId, "=", hallId);
+        if (startTime != null) {
+            cnd.and(GuildHallMeeting::getEndTime, ">=", startTime);
+        }
+        if (endTime != null) {
+            cnd.and(GuildHallMeeting::getStartTime, "<=", endTime);
+        }
+        cnd.asc(GuildHallMeeting::getStartTime);
+        List<NutMap> occupiedTimes = buildOccupiedTimes(dao.query(GuildHallMeeting.class, cnd), Boolean.TRUE.equals(includeFree));
+        int pageNumber = pageForm.getPageNumber() == null ? 1 : pageForm.getPageNumber();
+        int pageSize = pageForm.getPageSize() == null ? 10 : pageForm.getPageSize();
+        int totalCount = occupiedTimes.size();
+        int fromIndex = Math.min((pageNumber - 1) * pageSize, totalCount);
+        int toIndex = Math.min(fromIndex + pageSize, totalCount);
+        return Result.success(new Pagination<>(pageNumber, pageSize, totalCount,
+                occupiedTimes.subList(fromIndex, toIndex)));
+    }
+
 
     @At
     @SaCheckPermission("guildHall.meeting")
@@ -70,13 +96,12 @@ public class GuildHallMeetingController {
     @ApiOperation("保存会议厅会议")
 	@Aop(TransAop.READ_COMMITTED)
     public Result save(GuildHallMeeting meeting) {
-        dao.insert(meeting);
+        Result timeCheckResult = checkMeetingTime(meeting);
-		List<GuildHallSeat> seats = dao.query(GuildHallSeat.class, Cnd.where("hallId", "=", meeting.getHallId()));
+        if (timeCheckResult != null) {
-		List<GuildHallSeatSelect> selects = BeanUtil.copyToList(seats, GuildHallSeatSelect.class);
+            return timeCheckResult;
-		for (GuildHallSeatSelect select : selects) {
-			select.setMeetingId(meeting.getId());
         }
-		dao.insert(selects);
+        dao.insert(meeting);
+		initMeetingSeats(meeting.getId(), meeting.getHallId());
 		return Result.success();
     }
 
@@ -86,14 +111,19 @@ public class GuildHallMeetingController {
     @ApiOperation("修改会议厅会议")
 	@Aop(TransAop.READ_COMMITTED)
     public Result update(GuildHallMeeting meeting) {
+        GuildHallMeeting oldMeeting = dao.fetch(GuildHallMeeting.class, meeting.getId());
+        if (oldMeeting == null) {
+            return Result.error("会议不存在或已删除");
+        }
+        Result timeCheckResult = checkMeetingTime(meeting);
+        if (timeCheckResult != null) {
+            return timeCheckResult;
+        }
         dao.update(meeting);
-		dao.clear(GuildHallSeatSelect.class, Cnd.where("hallId", "=", meeting.getHallId()));
+        if (!StrUtil.equals(oldMeeting.getHallId(), meeting.getHallId())) {
-		List<GuildHallSeat> seats = dao.query(GuildHallSeat.class, Cnd.where("hallId", "=", meeting.getHallId()));
+			dao.clear(GuildHallSeatSelect.class, Cnd.where("meetingId", "=", meeting.getId()));
-		List<GuildHallSeatSelect> selects = BeanUtil.copyToList(seats, GuildHallSeatSelect.class);
+			initMeetingSeats(meeting.getId(), meeting.getHallId());
-		for (GuildHallSeatSelect select : selects) {
-			select.setMeetingId(meeting.getId());
         }
-		dao.insert(selects);
         return Result.success();
     }
 
@@ -101,11 +131,116 @@ public class GuildHallMeetingController {
     @SaCheckPermission("guildHall.meeting")
     @SLog(tag = "会议厅会议", msg = "删除会议厅会议")
     @ApiOperation("删除会议厅会议")
+    @Aop(TransAop.READ_COMMITTED)
     public Result delete(String id) {
+        dao.clear(GuildHallSeatSelect.class, Cnd.where("meetingId", "=", id));
         dao.delete(GuildHallMeeting.class, id);
         return Result.success();
     }
 
+	private void initMeetingSeats(String meetingId, String hallId) {
+		List<GuildHallSeat> seats = dao.query(GuildHallSeat.class, Cnd.where("hallId", "=", hallId));
+		List<GuildHallSeatSelect> selects = new ArrayList<>();
+		for (GuildHallSeat seat : seats) {
+			GuildHallSeatSelect select = new GuildHallSeatSelect();
+			select.setId(null);
+			select.setHallId(hallId);
+			select.setRowNumber(seat.getRowNumber());
+			select.setColNumber(seat.getColNumber());
+			select.setSeatNumber(seat.getSeatNumber());
+			select.setEnable(seat.getEnable());
+			select.setMeetingId(meetingId);
+			selects.add(select);
+		}
+		if (!selects.isEmpty()) {
+			dao.insert(selects);
+		}
+	}
+
+    private Result checkMeetingTime(GuildHallMeeting meeting) {
+        if (meeting.getStartTime() == null || meeting.getEndTime() == null) {
+            return Result.error("会议开始时间和结束时间不能为空");
+        }
+        if (!meeting.getStartTime().before(meeting.getEndTime())) {
+            return Result.error("会议结束时间必须大于开始时间");
+        }
+
+        Cnd conflictCnd = Cnd.where(GuildHallMeeting::getHallId, "=", meeting.getHallId())
+                .and(GuildHallMeeting::getStartTime, "<=", meeting.getEndTime())
+                .and(GuildHallMeeting::getEndTime, ">=", meeting.getStartTime());
+        if (StrUtil.isNotBlank(meeting.getId())) {
+            conflictCnd.and(GuildHallMeeting::getId, "!=", meeting.getId());
+        }
+        List<GuildHallMeeting> conflicts = dao.query(GuildHallMeeting.class,
+                conflictCnd.asc(GuildHallMeeting::getStartTime));
+        if (conflicts.isEmpty()) {
+            return null;
+        }
+
+        Cnd occupiedCnd = Cnd.where(GuildHallMeeting::getHallId, "=", meeting.getHallId());
+        if (StrUtil.isNotBlank(meeting.getId())) {
+            occupiedCnd.and(GuildHallMeeting::getId, "!=", meeting.getId());
+        }
+        List<GuildHallMeeting> occupiedMeetings = dao.query(GuildHallMeeting.class,
+                occupiedCnd.asc(GuildHallMeeting::getStartTime));
+        List<NutMap> occupiedTimes = buildOccupiedTimes(occupiedMeetings, false);
+
+        return Result.error("会议时间冲突，请查看该会议厅已占用时间").addData(occupiedTimes);
+    }
+
+    private List<NutMap> buildOccupiedTimes(List<GuildHallMeeting> meetings, boolean includeFree) {
+        List<NutMap> occupiedTimes = new ArrayList<>();
+        Map<String, List<GuildHallMeeting>> meetingsByHall = new HashMap<>();
+        for (GuildHallMeeting meeting : meetings) {
+            meetingsByHall.computeIfAbsent(meeting.getHallId(), key -> new ArrayList<>()).add(meeting);
+        }
+        List<GuildHall> halls = dao.query(GuildHall.class, Cnd.NEW().asc(GuildHall::getSortCode));
+        for (GuildHall hall : halls) {
+            List<GuildHallMeeting> hallMeetings = meetingsByHall.remove(hall.getId());
+            if (hallMeetings != null) {
+                appendHallTimes(occupiedTimes, hall.getId(), hall.getName(), hallMeetings, includeFree);
+            }
+        }
+        for (Map.Entry<String, List<GuildHallMeeting>> entry : meetingsByHall.entrySet()) {
+            appendHallTimes(occupiedTimes, entry.getKey(), "", entry.getValue(), includeFree);
+        }
+        return occupiedTimes;
+    }
+
+    private void appendHallTimes(List<NutMap> occupiedTimes, String hallId, String hallName,
+                                 List<GuildHallMeeting> meetings, boolean includeFree) {
+        meetings.sort(Comparator.comparing(GuildHallMeeting::getStartTime).reversed());
+        GuildHallMeeting previousMeeting = null;
+        for (GuildHallMeeting meeting : meetings) {
+            if (includeFree && previousMeeting != null) {
+                Date freeStartTime = new Date(meeting.getEndTime().getTime() + 1000);
+                Date freeEndTime = new Date(previousMeeting.getStartTime().getTime() - 1000);
+                if (!freeStartTime.after(freeEndTime)) {
+                    occupiedTimes.add(NutMap.NEW()
+                            .addv("hallId", hallId)
+                            .addv("hallName", hallName)
+                            .addv("name", "无会议")
+                            .addv("startTime", freeStartTime)
+                            .addv("endTime", freeEndTime)
+                            .addv("available", true));
+                }
+            }
+            occupiedTimes.add(NutMap.NEW()
+                    .addv("id", meeting.getId())
+                    .addv("hallId", hallId)
+                    .addv("hallName", hallName)
+                    .addv("name", displayMeetingName(meeting))
+                    .addv("startTime", meeting.getStartTime())
+                    .addv("endTime", meeting.getEndTime())
+                    .addv("available", false));
+            previousMeeting = meeting;
+        }
+    }
+
+    private String displayMeetingName(GuildHallMeeting meeting) {
+        return meeting.getName();
+    }
+
 	@At
 	@ApiOperation("查询会议")
 	public Result selectList() {

src/main/resources/views/platform/zhgh/democratic/teachercongress/guildhall/meeting/index.html

@@ -23,6 +23,46 @@ layout("/layouts/platform.html"){
         min-height: 0;
         overflow-y: auto;
     }
+
+    .occupied-time-dialog {
+        height: calc(100vh - 40px);
+        max-height: 900px;
+        margin: 0 !important;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        display: flex;
+        flex-direction: column;
+    }
+
+    .occupied-time-dialog .el-dialog__header,
+    .occupied-time-dialog .el-dialog__footer {
+        flex-shrink: 0;
+    }
+
+    .occupied-time-dialog .el-dialog__body {
+        flex: 1;
+        min-height: 0;
+        overflow-y: auto;
+    }
+
+    .occupied-filter-form {
+        display: flex;
+        align-items: center;
+        flex-wrap: nowrap;
+    }
+
+    .occupied-filter-form .occupied-free-switch-item {
+        margin-left: auto;
+    }
+
+    .occupied-free-switch-label {
+        margin-right: 8px;
+        color: #606266;
+        font-size: 14px;
+        font-weight: 500;
+    }
 </style>
 
 <div id="app" v-cloak>
@@ -39,6 +79,7 @@ layout("/layouts/platform.html"){
 
     <el-card shadow="never">
         <table-tool>
+            <el-button type="primary" plain icon="el-icon-time" size="small" @click="openOccupiedDialog">会议厅占用情况</el-button>
             <el-button type="primary" icon="el-icon-plus" size="small" @click="onAdd">新增</el-button>
         </table-tool>
         <el-table :data="tableData" ref="tableRef" @sort-change="pageOrder">
@@ -103,6 +144,66 @@ layout("/layouts/platform.html"){
         </div>
     </el-dialog>
 
+    <el-dialog :title="occupiedDialogTitle" :visible.sync="occupiedDialogVisible" width="1360px"
+               custom-class="occupied-time-dialog">
+        <el-form class="occupied-filter-form" :inline="true" :model="occupiedForm">
+            <el-form-item label="会议厅">
+                <el-select clearable v-model="occupiedForm.hallId" placeholder="请选择会议厅">
+                    <el-option v-for="item in hallList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="开始时间">
+                <el-date-picker v-model="occupiedForm.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="请选择开始时间"></el-date-picker>
+            </el-form-item>
+            <el-form-item label="结束时间">
+                <el-date-picker v-model="occupiedForm.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="请选择结束时间"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="searchOccupiedTimes">查询</el-button>
+                <el-button @click="resetOccupiedSearch">重置</el-button>
+            </el-form-item>
+            <el-form-item class="occupied-free-switch-item">
+                <span class="occupied-free-switch-label">展开空闲会议</span>
+                <el-switch v-model="occupiedForm.includeFree" @change="searchOccupiedTimes"></el-switch>
+            </el-form-item>
+        </el-form>
+        <el-table :data="occupiedList" v-loading="occupiedLoading" max-height="650px">
+            <el-table-column type="index" width="50" label="序号"></el-table-column>
+            <el-table-column prop="hallName" label="会议厅"></el-table-column>
+            <el-table-column prop="name" label="会议名称">
+                <template scope="{row}">
+                    <el-tag v-if="row.available" type="success">空闲</el-tag>
+                    <span v-else>{{row.name}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column prop="startTime" label="开始时间">
+                <template scope="{row}">{{formatOccupiedTime(row.startTime)}}</template>
+            </el-table-column>
+            <el-table-column prop="endTime" label="结束时间">
+                <template scope="{row}">{{formatOccupiedTime(row.endTime)}}</template>
+            </el-table-column>
+            <el-table-column v-if="occupiedForm.includeFree" label="操作" width="120px">
+                <template scope="{row}">
+                    <el-button type="primary" size="mini" :disabled="!row.available"
+                               @click="quickAddMeeting(row)">新增会议</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-row class="el-pagination-container" style="margin-top: 20px">
+            <el-pagination
+                    @size-change="occupiedPageSizeChange"
+                    @current-change="occupiedPageNumberChange"
+                    :current-page="occupiedForm.pageNumber"
+                    :page-sizes="[10, 20, 30, 50]"
+                    :page-size="occupiedForm.pageSize"
+                    layout="total, sizes, prev, pager, next"
+                    :total="occupiedForm.totalCount">
+            </el-pagination>
+        </el-row>
+    </el-dialog>
+
 </div>
 
 <script nonce="${cspNonce!}">
@@ -121,6 +222,19 @@ layout("/layouts/platform.html"){
                     content: [{required: true, message: '必填', trigger: 'blur'}],
                 },
                 hallList: [],
+                occupiedDialogVisible: false,
+                occupiedLoading: false,
+                occupiedDialogTitle: '会议厅时间安排',
+                occupiedList: [],
+                occupiedForm: {
+                    hallId: null,
+                    startTime: null,
+                    endTime: null,
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    includeFree: false
+                },
             }
         },
         methods: {
@@ -154,6 +268,19 @@ layout("/layouts/platform.html"){
                                 this.$message.success(res.msg)
                                 this.dialogVisible = false
                                 this.doSearch()
+                            } else if (Array.isArray(res.data) && res.data.length > 0) {
+                                this.occupiedDialogTitle = '该会议厅时间安排'
+                                this.occupiedForm = {
+                                    hallId: this.formData.hallId,
+                                    startTime: null,
+                                    endTime: null,
+                                    pageNumber: 1,
+                                    pageSize: 10,
+                                    totalCount: res.data.length,
+                                    includeFree: false
+                                }
+                                this.occupiedList = res.data.slice(0, 10)
+                                this.occupiedDialogVisible = true
                             }
                         })
                     }).catch(() => {
@@ -178,6 +305,64 @@ layout("/layouts/platform.html"){
                     this.hallList = res.data
                 })
             },
+            openOccupiedDialog() {
+                this.occupiedDialogTitle = '会议厅时间安排'
+                this.occupiedDialogVisible = true
+                this.loadOccupiedTimes()
+            },
+            loadOccupiedTimes() {
+                this.occupiedLoading = true
+                this.$axios.post('/platform/guildHall/meeting/occupiedTimes', this.occupiedForm).then(res => {
+                    if (res.code === 0) {
+                        this.occupiedList = res.data ? res.data.list : []
+                        this.occupiedForm.totalCount = res.data ? res.data.totalCount : 0
+                    }
+                }).finally(() => {
+                    this.occupiedLoading = false
+                })
+            },
+            searchOccupiedTimes() {
+                this.occupiedForm.pageNumber = 1
+                this.loadOccupiedTimes()
+            },
+            resetOccupiedSearch() {
+                this.occupiedForm = {
+                    hallId: null,
+                    startTime: null,
+                    endTime: null,
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    includeFree: false
+                }
+                this.loadOccupiedTimes()
+            },
+            occupiedPageSizeChange(pageSize) {
+                this.occupiedForm.pageSize = pageSize
+                this.occupiedForm.pageNumber = 1
+                this.loadOccupiedTimes()
+            },
+            occupiedPageNumberChange(pageNumber) {
+                this.occupiedForm.pageNumber = pageNumber
+                this.loadOccupiedTimes()
+            },
+            formatOccupiedTime(time) {
+                return time ? this.$moment(time).format('YYYY-MM-DD HH:mm:ss') : ''
+            },
+            quickAddMeeting(row) {
+                this.occupiedDialogVisible = false
+                this.dialogVisible = true
+                this.formData = {
+                    id: null,
+                    name: null,
+                    year: this.$moment(row.startTime).format('YYYY'),
+                    startTime: this.$moment(row.startTime).format('YYYY-MM-DD HH:mm:ss'),
+                    endTime: this.$moment(row.endTime).format('YYYY-MM-DD HH:mm:ss'),
+                    hallId: row.hallId,
+                    content: null,
+                    groupId: null
+                }
+            },
         },
         created() {
             this.selectList();