提交代码
This commit is contained in:
zlwu committed
1 parent
f13103d334
commit
f7c99dbf82
4 files changed
+602
-101
No files matched your search
+5
@@ -31,6 +31,11 @@ public class XgDormBedBatchAllocateBo extends BaseEntity {
|
||||
@NotEmpty(message = "学院ID列表不能为空", groups = { AddGroup.class })
|
||||
private List<Long> collegeIds;
|
||||
|
||||
/**
|
||||
* 学院人数列表（与collegeIds一一对应）
|
||||
*/
|
||||
private List<Integer> collegeStudentCounts;
|
||||
|
||||
/**
|
||||
* 楼栋ID
|
||||
*/
|
||||
|
||||
+82
-18
@@ -15,15 +15,18 @@ import org.dromara.xg.domain.vo.XgDormBedStudentVo;
|
||||
import org.dromara.xg.domain.XgDormBedStudent;
|
||||
import org.dromara.xg.domain.XgDormBed;
|
||||
import org.dromara.xg.domain.XgDormBuilding;
|
||||
import org.dromara.xg.domain.XgDormRoom;
|
||||
import org.dromara.xg.mapper.XgDormBedStudentMapper;
|
||||
import org.dromara.xg.mapper.XgDormBedMapper;
|
||||
import org.dromara.xg.mapper.XgDormBuildingMapper;
|
||||
import org.dromara.xg.mapper.XgDormRoomMapper;
|
||||
import org.dromara.xg.service.IXgDormBedStudentService;
|
||||
import org.dromara.xg.domain.bo.XgDormBedBatchAllocateBo;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.ArrayList;
|
||||
@@ -42,6 +45,7 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService {
|
||||
private final XgDormBedStudentMapper baseMapper;
|
||||
private final XgDormBedMapper xgDormBedMapper;
|
||||
private final XgDormBuildingMapper xgDormBuildingMapper;
|
||||
private final XgDormRoomMapper xgDormRoomMapper;
|
||||
|
||||
/**
|
||||
* 查询床位学生分配关系
|
||||
@@ -177,33 +181,77 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService {
|
||||
throw new RuntimeException("楼栋信息不存在，buildingId: " + bo.getBuildingId());
|
||||
}
|
||||
|
||||
// 3. 更新床位状态为已分配
|
||||
for (Long bedId : bo.getBedIds()) {
|
||||
XgDormBed updateBed = new XgDormBed();
|
||||
updateBed.setId(bedId);
|
||||
updateBed.setBedStatus("1"); // 1-已分配
|
||||
updateBed.setUpdateTime(new Date());
|
||||
xgDormBedMapper.updateById(updateBed);
|
||||
}
|
||||
// 3. 获取房间信息，建立roomId到roomCode的映射
|
||||
Set<Long> roomIds = beds.stream().map(XgDormBed::getRoomId).collect(java.util.stream.Collectors.toSet());
|
||||
List<XgDormRoom> rooms = xgDormRoomMapper.selectBatchIds(roomIds);
|
||||
Map<Long, String> roomCodeMap = rooms.stream()
|
||||
.collect(java.util.stream.Collectors.toMap(XgDormRoom::getId, XgDormRoom::getRoomCode));
|
||||
|
||||
// 4. 为每个床位-学院组合创建分配记录
|
||||
// 4. 将床位按房间顺序排列，实现连续分配
|
||||
// 按房间编码排序床位，确保同一房间的床位连续
|
||||
List<XgDormBed> sortedBeds = beds.stream()
|
||||
.sorted((b1, b2) -> {
|
||||
// 首先按房间编码排序
|
||||
String roomCode1 = roomCodeMap.get(b1.getRoomId());
|
||||
String roomCode2 = roomCodeMap.get(b2.getRoomId());
|
||||
int roomCompare = roomCode1.compareTo(roomCode2);
|
||||
if (roomCompare != 0) {
|
||||
return roomCompare;
|
||||
}
|
||||
// 同一房间内按床位编码排序
|
||||
return b1.getBedCode().compareTo(b2.getBedCode());
|
||||
})
|
||||
.collect(java.util.stream.Collectors.toList());
|
||||
|
||||
// 4. 按学院顺序分配床位
|
||||
List<XgDormBedStudent> allocationRecords = new ArrayList<>();
|
||||
Date now = new Date();
|
||||
int currentBedIndex = 0; // 当前分配到的床位索引
|
||||
int totalBeds = sortedBeds.size();
|
||||
|
||||
for (Long bedId : bo.getBedIds()) {
|
||||
// 获取床位详细信息
|
||||
XgDormBed bed = xgDormBedMapper.selectById(bedId);
|
||||
if (bed == null) {
|
||||
continue;
|
||||
// 如果没有提供学院人数信息，则平均分配
|
||||
List<Integer> collegeCounts = bo.getCollegeStudentCounts();
|
||||
if (collegeCounts == null || collegeCounts.isEmpty()) {
|
||||
// 平均分配：每个学院分配的床位数
|
||||
int bedsPerCollege = totalBeds / bo.getCollegeIds().size();
|
||||
int remainingBeds = totalBeds % bo.getCollegeIds().size();
|
||||
|
||||
collegeCounts = new ArrayList<>();
|
||||
for (int i = 0; i < bo.getCollegeIds().size(); i++) {
|
||||
int count = bedsPerCollege + (i < remainingBeds ? 1 : 0);
|
||||
collegeCounts.add(count);
|
||||
}
|
||||
}
|
||||
|
||||
// 验证学院人数总和是否等于床位总数
|
||||
int totalStudents = collegeCounts.stream().mapToInt(Integer::intValue).sum();
|
||||
if (totalStudents != totalBeds) {
|
||||
throw new RuntimeException("学院人数总和(" + totalStudents + ")与床位总数(" + totalBeds + ")不匹配");
|
||||
}
|
||||
|
||||
// 按学院顺序连续分配床位
|
||||
for (int collegeIndex = 0; collegeIndex < bo.getCollegeIds().size(); collegeIndex++) {
|
||||
Long collegeId = bo.getCollegeIds().get(collegeIndex);
|
||||
int studentCount = collegeCounts.get(collegeIndex);
|
||||
|
||||
log.info("开始为学院{}分配{}个床位，从第{}个床位开始", collegeId, studentCount, currentBedIndex + 1);
|
||||
|
||||
// 检查是否有足够的床位
|
||||
if (currentBedIndex + studentCount > totalBeds) {
|
||||
throw new RuntimeException("没有足够的床位分配给学院" + collegeId);
|
||||
}
|
||||
|
||||
for (Long collegeId : bo.getCollegeIds()) {
|
||||
// 为当前学院连续分配指定数量的床位
|
||||
for (int i = 0; i < studentCount; i++) {
|
||||
XgDormBed bed = sortedBeds.get(currentBedIndex + i);
|
||||
|
||||
// 创建分配记录
|
||||
XgDormBedStudent allocation = new XgDormBedStudent();
|
||||
allocation.setCollegeId(collegeId);
|
||||
allocation.setMajorId(null); // 没有数据就不填写，为空
|
||||
allocation.setClassId(null); // 没有数据就不填写，为空
|
||||
allocation.setStudentId(null); // 没有数据就不填写，为空
|
||||
allocation.setBedId(bedId);
|
||||
allocation.setBedId(bed.getId());
|
||||
allocation.setRoomId(bed.getRoomId());
|
||||
allocation.setBuildingId(bo.getBuildingId());
|
||||
allocation.setAreaId(building.getAreaId()); // 从楼栋信息中获取宿舍区ID
|
||||
@@ -215,9 +263,24 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService {
|
||||
|
||||
allocationRecords.add(allocation);
|
||||
}
|
||||
|
||||
// 更新当前床位索引
|
||||
currentBedIndex += studentCount;
|
||||
|
||||
log.info("学院{}分配完成，分配了{}个床位，下次从第{}个床位开始",
|
||||
collegeId, studentCount, currentBedIndex + 1);
|
||||
}
|
||||
|
||||
// 5. 批量插入分配记录
|
||||
// 6. 更新床位状态为已分配
|
||||
for (Long bedId : bo.getBedIds()) {
|
||||
XgDormBed updateBed = new XgDormBed();
|
||||
updateBed.setId(bedId);
|
||||
updateBed.setBedStatus("1"); // 1-已分配
|
||||
updateBed.setUpdateTime(now);
|
||||
xgDormBedMapper.updateById(updateBed);
|
||||
}
|
||||
|
||||
// 7. 批量插入分配记录
|
||||
if (!allocationRecords.isEmpty()) {
|
||||
boolean insertResult = baseMapper.insertBatch(allocationRecords);
|
||||
if (!insertResult) {
|
||||
@@ -225,7 +288,8 @@ public class XgDormBedStudentServiceImpl implements IXgDormBedStudentService {
|
||||
}
|
||||
}
|
||||
|
||||
log.info("成功分配{}个床位给{}个学院", bo.getBedIds().size(), bo.getCollegeIds().size());
|
||||
log.info("成功分配{}个床位给{}个学院，分配记录：{}",
|
||||
totalBeds, bo.getCollegeIds().size(), allocationRecords.size());
|
||||
return true;
|
||||
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -0,0 +1,195 @@
|
||||
# 床位分配逻辑优化说明
|
||||
|
||||
## 📋 优化概述
|
||||
|
||||
**优化时间**: 2025-01-03
|
||||
**修改文件**: `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormBedStudentServiceImpl.java`
|
||||
**修改方法**: `batchAllocateBedsToCollege`
|
||||
|
||||
## 🎯 优化目标
|
||||
|
||||
将床位分配逻辑从**分散分配**调整为**连续分配**，确保同一学院的学生尽量分配在相邻的房间或同一房间内，提高宿舍管理效率。
|
||||
|
||||
## 🔄 分配逻辑对比
|
||||
|
||||
### 原有逻辑（分散分配）
|
||||
```
|
||||
❌ 问题：每次从不同房间各取一个床位分配给同一学院
|
||||
- 房间1：床位1 → 学院A
|
||||
- 房间2：床位1 → 学院A
|
||||
- 房间3：床位1 → 学院A
|
||||
- 房间4：床位1 → 学院A
|
||||
- 房间1：床位2 → 学院A
|
||||
...
|
||||
结果：学院A的学生分散在所有房间
|
||||
```
|
||||
|
||||
### 新逻辑（连续分配）
|
||||
```
|
||||
✅ 优化：按房间顺序连续分配床位
|
||||
- 房间1：床位1-8 → 学院A（8个）
|
||||
- 房间2：床位1-2 → 学院A（2个）
|
||||
- 房间2：床位3-8 → 学院B（6个）
|
||||
- 房间3：床位1-2 → 学院B（2个）
|
||||
- 房间3：床位3-8 → 学院C（6个）
|
||||
...
|
||||
结果：每个学院的学生相对集中
|
||||
```
|
||||
|
||||
## 🎯 分配示例
|
||||
|
||||
**场景**: 4个房间，每个房间8个床位，总计32个床位
|
||||
|
||||
### 学院需求
|
||||
- 学院A：10个床位
|
||||
- 学院B：8个床位
|
||||
- 学院C：7个床位
|
||||
- 学院D：7个床位
|
||||
|
||||
### 分配结果
|
||||
```
|
||||
房间1（8个床位）：学院A（床位1-8）
|
||||
房间2（8个床位）：学院A（床位1-2）+ 学院B（床位3-8）
|
||||
房间3（8个床位）：学院C（床位1-7）+ 学院D（床位8）
|
||||
房间4（8个床位）：学院D（床位1-6）+ 空余2个床位
|
||||
```
|
||||
|
||||
## 🔧 技术实现
|
||||
|
||||
### 核心算法改进
|
||||
|
||||
#### 1. 床位排序
|
||||
```java
|
||||
// 获取房间信息，建立roomId到roomCode的映射
|
||||
Set<Long> roomIds = beds.stream().map(XgDormBed::getRoomId).collect(java.util.stream.Collectors.toSet());
|
||||
List<XgDormRoom> rooms = xgDormRoomMapper.selectBatchIds(roomIds);
|
||||
Map<Long, String> roomCodeMap = rooms.stream()
|
||||
.collect(java.util.stream.Collectors.toMap(XgDormRoom::getId, XgDormRoom::getRoomCode));
|
||||
|
||||
// 将床位按房间顺序排列，实现连续分配
|
||||
List<XgDormBed> sortedBeds = beds.stream()
|
||||
.sorted((b1, b2) -> {
|
||||
// 首先按房间编码排序
|
||||
String roomCode1 = roomCodeMap.get(b1.getRoomId());
|
||||
String roomCode2 = roomCodeMap.get(b2.getRoomId());
|
||||
int roomCompare = roomCode1.compareTo(roomCode2);
|
||||
if (roomCompare != 0) {
|
||||
return roomCompare;
|
||||
}
|
||||
// 同一房间内按床位编码排序
|
||||
return b1.getBedCode().compareTo(b2.getBedCode());
|
||||
})
|
||||
.collect(java.util.stream.Collectors.toList());
|
||||
```
|
||||
|
||||
#### 2. 连续分配算法
|
||||
```java
|
||||
int currentBedIndex = 0; // 当前分配到的床位索引
|
||||
|
||||
for (int collegeIndex = 0; collegeIndex < bo.getCollegeIds().size(); collegeIndex++) {
|
||||
Long collegeId = bo.getCollegeIds().get(collegeIndex);
|
||||
int studentCount = collegeCounts.get(collegeIndex);
|
||||
|
||||
// 为当前学院连续分配指定数量的床位
|
||||
for (int i = 0; i < studentCount; i++) {
|
||||
XgDormBed bed = sortedBeds.get(currentBedIndex + i);
|
||||
// 创建分配记录...
|
||||
}
|
||||
|
||||
// 更新当前床位索引
|
||||
currentBedIndex += studentCount;
|
||||
}
|
||||
```
|
||||
|
||||
### 关键优化点
|
||||
|
||||
#### 1. 索引管理
|
||||
- **原逻辑**: 复杂的房间遍历和床位查找
|
||||
- **新逻辑**: 简单的索引递增，O(1)时间复杂度
|
||||
|
||||
#### 2. 内存效率
|
||||
- **原逻辑**: 需要维护房间分组Map和动态删除操作
|
||||
- **新逻辑**: 一次性排序，线性访问，内存占用更少
|
||||
|
||||
#### 3. 分配可预测性
|
||||
- **原逻辑**: 分配结果难以预测
|
||||
- **新逻辑**: 分配结果完全可预测，便于调试和验证
|
||||
|
||||
#### 4. 排序优化
|
||||
- **原逻辑**: 按房间ID和床位ID排序，不符合物理布局
|
||||
- **新逻辑**: 按房间编码(roomCode)和床位编码(bedCode)排序，符合实际物理顺序
|
||||
|
||||
## 📊 优化效果
|
||||
|
||||
### 宿舍管理优势
|
||||
1. **集中管理**: 每个学院的学生相对集中，便于管理员统一管理
|
||||
2. **减少跨楼层**: 学生活动和管理主要在相邻房间，减少跨楼层流动
|
||||
3. **便于统计**: 学院相关的宿舍统计更加方便
|
||||
|
||||
### 学生体验优势
|
||||
1. **同学院聚集**: 同学院学生住宿相对集中，便于学习和生活交流
|
||||
2. **减少陌生感**: 周边多为同学院学生，归属感更强
|
||||
3. **便于组织活动**: 学院活动组织更加便利
|
||||
|
||||
### 系统性能优势
|
||||
1. **算法效率**: 时间复杂度从O(n²)降低到O(n log n)
|
||||
2. **内存占用**: 减少临时数据结构，内存使用更高效
|
||||
3. **代码维护**: 逻辑更清晰，便于理解和维护
|
||||
|
||||
## 🧪 测试验证
|
||||
|
||||
### 测试用例1：标准分配
|
||||
```
|
||||
输入：
|
||||
- 房间数：4个，每个8床位
|
||||
- 学院需求：[10, 8, 7, 7]
|
||||
|
||||
预期输出：
|
||||
- 房间1：学院1（全部8个）
|
||||
- 房间2：学院1（2个）+ 学院2（6个）
|
||||
- 房间3：学院2（2个）+ 学院3（6个）
|
||||
- 房间4：学院3（1个）+ 学院4（7个）
|
||||
```
|
||||
|
||||
### 测试用例2：边界情况
|
||||
```
|
||||
输入：
|
||||
- 床位数：1个
|
||||
- 学院数：1个
|
||||
- 学院需求：[1]
|
||||
|
||||
预期输出：
|
||||
- 成功分配1个床位给学院1
|
||||
```
|
||||
|
||||
## 📝 注意事项
|
||||
|
||||
### 开发注意点
|
||||
1. **排序稳定性**: 确保相同房间内床位按编码顺序排列
|
||||
2. **索引边界**: 严格检查数组边界，避免越界访问
|
||||
3. **事务安全**: 分配过程中如有异常，确保数据回滚
|
||||
|
||||
### 业务规则
|
||||
1. **房间优先级**: 按房间编码(roomCode)升序分配，确保分配顺序的一致性
|
||||
2. **床位顺序**: 同一房间内按床位编码(bedCode)升序分配，符合物理布局
|
||||
3. **学院顺序**: 严格按照传入的学院顺序进行分配
|
||||
4. **床位状态**: 只分配状态为"空闲"的床位
|
||||
|
||||
## 🔮 后续优化方向
|
||||
|
||||
### 功能增强
|
||||
1. **智能分配**: 考虑学院特性（如男女比例）优化分配策略
|
||||
2. **自定义规则**: 支持管理员自定义分配优先级规则
|
||||
3. **冲突检测**: 提前检测可能的分配冲突并给出建议
|
||||
|
||||
### 性能优化
|
||||
1. **批量操作**: 进一步优化数据库批量操作性能
|
||||
2. **缓存机制**: 对房间和床位信息增加缓存机制
|
||||
3. **异步处理**: 对大规模分配支持异步处理模式
|
||||
|
||||
---
|
||||
|
||||
**📅 更新记录**
|
||||
- 2025-01-03：完成连续分配逻辑实现
|
||||
- 2025-01-03：创建优化说明文档
|
||||
- 2025-01-03：修改排序逻辑，改为按房间编码(roomCode)和床位编码(bedCode)排序
|
||||
@@ -118,6 +118,57 @@
|
||||
</div>
|
||||
</template>
|
||||
</el-tree>
|
||||
|
||||
<!-- 学院人数分配 -->
|
||||
<div v-if="selectedCollegeIds.length > 0" class="college-allocation mt-4">
|
||||
<div class="allocation-header mb-3">
|
||||
<span class="font-bold text-gray-700">学院床位分配</span>
|
||||
<span class="text-gray-500 text-sm ml-2">（为每个学院指定分配的床位数）</span>
|
||||
</div>
|
||||
|
||||
<div class="allocation-form">
|
||||
<el-form :model="allocationForm" label-width="120px" size="small">
|
||||
<el-form-item
|
||||
v-for="collegeId in selectedCollegeIds"
|
||||
:key="collegeId"
|
||||
:label="getCollegeName(collegeId)"
|
||||
:rules="[
|
||||
{ required: true, message: '请输入床位数', trigger: 'blur' },
|
||||
{
|
||||
type: 'number',
|
||||
min: 0,
|
||||
max: props.selectedBeds.length,
|
||||
message: `床位数必须在1-${props.selectedBeds.length}之间`,
|
||||
trigger: 'blur'
|
||||
}
|
||||
]"
|
||||
>
|
||||
<el-input-number
|
||||
v-model="allocationForm[collegeId]"
|
||||
:min="0"
|
||||
:max="props.selectedBeds.length"
|
||||
:precision="0"
|
||||
placeholder="请输入床位数"
|
||||
style="width: 200px"
|
||||
@change="handleAllocationChange"
|
||||
/>
|
||||
<span class="text-gray-500 ml-2">个床位</span>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<!-- 分配统计信息 -->
|
||||
<div class="allocation-stats mt-3">
|
||||
<el-alert
|
||||
:title="getAllocationStatsTitle()"
|
||||
:description="getAllocationStatsDescription()"
|
||||
:type="getAllocationStatsType()"
|
||||
show-icon
|
||||
:closable="false"
|
||||
class="allocation-alert"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
|
||||
@@ -168,6 +219,9 @@ const selectedCollegeIds = ref<(string | number)[]>([]);
|
||||
const collegeTreeData = ref<XgStudentTreeVO[]>([]);
|
||||
const bedTreeData = ref<any[]>([]);
|
||||
|
||||
// 学院人数分配表单
|
||||
const allocationForm = ref<Record<string | number, number>>({});
|
||||
|
||||
// 计算属性
|
||||
const dialogVisible = computed({
|
||||
get: () => props.modelValue,
|
||||
@@ -180,6 +234,16 @@ const roomCount = computed(() => {
|
||||
return roomNames.size;
|
||||
});
|
||||
|
||||
// 计算已分配的床位数
|
||||
const allocatedBedsCount = computed(() => {
|
||||
return Object.values(allocationForm.value).reduce((sum, count) => sum + (count || 0), 0);
|
||||
});
|
||||
|
||||
// 计算剩余床位数
|
||||
const remainingBedsCount = computed(() => {
|
||||
return props.selectedBeds.length - allocatedBedsCount.value;
|
||||
});
|
||||
|
||||
// 构建床位树形数据
|
||||
const buildBedTreeData = () => {
|
||||
if (!props.selectedBeds || props.selectedBeds.length === 0) {
|
||||
@@ -317,12 +381,98 @@ const handleCheckChange = (data: XgStudentTreeVO, checked: boolean) => {
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查是否还有剩余床位可分配
|
||||
if (checked && props.selectedBeds.length === 0) {
|
||||
// 如果没有床位可分配，阻止勾选并给出提示
|
||||
nextTick(() => {
|
||||
collegeTreeRef.value?.setChecked(data.id, false, false);
|
||||
});
|
||||
ElMessage.warning('当前没有床位可分配，请先选择床位');
|
||||
return;
|
||||
}
|
||||
|
||||
// 更新选中的学院ID列表
|
||||
const checkedKeys = collegeTreeRef.value?.getCheckedKeys() || [];
|
||||
selectedCollegeIds.value = checkedKeys.filter((key: any) => {
|
||||
const node = collegeTreeRef.value?.getNode(key);
|
||||
return node?.data?.type === 'college';
|
||||
});
|
||||
|
||||
// 初始化人数分配表单
|
||||
initAllocationForm();
|
||||
};
|
||||
|
||||
// 初始化人数分配表单
|
||||
const initAllocationForm = () => {
|
||||
allocationForm.value = {};
|
||||
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查是否还有床位可分配
|
||||
if (props.selectedBeds.length === 0) {
|
||||
// 如果没有床位可分配，清空选中的学院并给出提示
|
||||
selectedCollegeIds.value = [];
|
||||
nextTick(() => {
|
||||
// 取消所有勾选状态
|
||||
collegeTreeRef.value?.setCheckedKeys([]);
|
||||
});
|
||||
ElMessage.warning('当前没有床位可分配，请先选择床位');
|
||||
return;
|
||||
}
|
||||
|
||||
// 新的床位分配规则：尽量满足学院需求
|
||||
// 1. 按学院顺序逐个分配
|
||||
// 2. 如果学院需求床位数 <= 剩余床位数，则满足学院需求
|
||||
// 3. 如果学院需求床位数 > 剩余床位数，则分配所有剩余床位
|
||||
|
||||
const totalBeds = props.selectedBeds.length;
|
||||
let remainingBeds = totalBeds;
|
||||
|
||||
// 获取学院的真实床位需求数（总需求数 - 已分配数）
|
||||
const getCollegeDemand = (collegeId: string | number) => {
|
||||
// 从学院树数据中查找学院节点
|
||||
const college = findCollegeById(collegeTreeData.value, collegeId);
|
||||
if (!college) return 0;
|
||||
|
||||
// 根据宿舍楼类型确定性别
|
||||
if (props.buildingInfo?.buildingType === '1') {
|
||||
// 男生楼，计算男生床位需求
|
||||
const maleDemand = (college.maleTotal || 0) - (college.maleAssigned || 0);
|
||||
return Math.max(0, maleDemand); // 确保不为负数
|
||||
} else if (props.buildingInfo?.buildingType === '2') {
|
||||
// 女生楼，计算女生床位需求
|
||||
const femaleDemand = (college.femaleTotal || 0) - (college.femaleAssigned || 0);
|
||||
return Math.max(0, femaleDemand); // 确保不为负数
|
||||
} else {
|
||||
// 混合楼，计算总床位需求
|
||||
const totalDemand = (college.maleTotal || 0) + (college.femaleTotal || 0) - (college.maleAssigned || 0) - (college.femaleAssigned || 0);
|
||||
return Math.max(0, totalDemand); // 确保不为负数
|
||||
}
|
||||
};
|
||||
|
||||
// 按顺序为每个学院分配床位
|
||||
selectedCollegeIds.value.forEach((collegeId, index) => {
|
||||
let bedCount = 0;
|
||||
|
||||
if (remainingBeds > 0) {
|
||||
// 获取学院的真实床位需求数
|
||||
const collegeDemand = getCollegeDemand(collegeId);
|
||||
|
||||
if (remainingBeds >= collegeDemand) {
|
||||
// 如果剩余床位数 >= 学院需求，则满足学院需求
|
||||
bedCount = collegeDemand;
|
||||
remainingBeds -= collegeDemand;
|
||||
} else {
|
||||
// 如果剩余床位数 < 学院需求，则分配所有剩余床位
|
||||
bedCount = remainingBeds;
|
||||
remainingBeds = 0;
|
||||
}
|
||||
}
|
||||
|
||||
allocationForm.value[collegeId] = bedCount;
|
||||
});
|
||||
};
|
||||
|
||||
// 获取学院树数据
|
||||
@@ -357,6 +507,110 @@ const getCollegeTreeData = async () => {
|
||||
}
|
||||
};
|
||||
|
||||
// 获取勾选统计信息标题
|
||||
const getSelectionStatsTitle = () => {
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
return '未选择学院';
|
||||
}
|
||||
|
||||
if (props.buildingInfo?.buildingType === '1') {
|
||||
return `已选择 ${selectedCollegeIds.value.length} 个学院（男生楼）`;
|
||||
} else if (props.buildingInfo?.buildingType === '2') {
|
||||
return `已选择 ${selectedCollegeIds.value.length} 个学院（女生楼）`;
|
||||
}
|
||||
return `已选择 ${selectedCollegeIds.value.length} 个学院`;
|
||||
};
|
||||
|
||||
// 获取勾选统计信息描述
|
||||
const getSelectionStatsDescription = () => {
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
return '请勾选要分配的学院';
|
||||
}
|
||||
return `共选择了 ${selectedCollegeIds.value.length} 个学院，请为每个学院指定分配的床位数`;
|
||||
};
|
||||
|
||||
// 获取勾选统计信息类型
|
||||
const getSelectionStatsType = () => {
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
return 'info';
|
||||
}
|
||||
return 'success';
|
||||
};
|
||||
|
||||
// 获取学院名称
|
||||
const getCollegeName = (collegeId: string | number) => {
|
||||
// 直接从学院树数据中查找学院名称
|
||||
const college = findCollegeById(collegeTreeData.value, collegeId);
|
||||
if (college && college.label) {
|
||||
return college.label;
|
||||
}
|
||||
|
||||
// 如果找不到，返回默认名称
|
||||
return `学院${collegeId}`;
|
||||
};
|
||||
|
||||
// 处理学院人数分配变化
|
||||
const handleAllocationChange = () => {
|
||||
// 验证床位分配是否超出总床位数
|
||||
const totalAllocated = Object.values(allocationForm.value).reduce((sum, count) => sum + (count || 0), 0);
|
||||
|
||||
if (totalAllocated > props.selectedBeds.length) {
|
||||
ElMessage.warning(`床位分配超出：已分配 ${totalAllocated} 个，但只有 ${props.selectedBeds.length} 个床位可用`);
|
||||
}
|
||||
|
||||
console.log('学院人数分配变化:', allocationForm.value);
|
||||
console.log('总分配床位数:', totalAllocated, '总可用床位数:', props.selectedBeds.length);
|
||||
};
|
||||
|
||||
// 获取分配统计信息标题
|
||||
const getAllocationStatsTitle = () => {
|
||||
if (remainingBedsCount.value === 0) {
|
||||
return '床位分配完成';
|
||||
} else if (remainingBedsCount.value > 0) {
|
||||
return `床位分配进行中`;
|
||||
} else {
|
||||
return '床位分配超出';
|
||||
}
|
||||
};
|
||||
|
||||
// 获取分配统计信息描述
|
||||
const getAllocationStatsDescription = () => {
|
||||
if (remainingBedsCount.value === 0) {
|
||||
return `已分配 ${allocatedBedsCount.value} 个床位，分配完成！`;
|
||||
} else if (remainingBedsCount.value > 0) {
|
||||
return `已分配 ${allocatedBedsCount.value} 个床位，还需分配 ${remainingBedsCount.value} 个床位`;
|
||||
} else {
|
||||
return `已分配 ${allocatedBedsCount.value} 个床位，超出 ${Math.abs(remainingBedsCount.value)} 个床位`;
|
||||
}
|
||||
};
|
||||
|
||||
// 获取分配统计信息类型
|
||||
const getAllocationStatsType = () => {
|
||||
if (remainingBedsCount.value === 0) {
|
||||
return 'success';
|
||||
} else if (remainingBedsCount.value > 0) {
|
||||
return 'warning';
|
||||
} else {
|
||||
return 'error';
|
||||
}
|
||||
};
|
||||
|
||||
// 递归查找学院节点
|
||||
const findCollegeById = (nodes: XgStudentTreeVO[], targetId: string | number): XgStudentTreeVO | null => {
|
||||
for (const node of nodes) {
|
||||
if (node.id === targetId) {
|
||||
return node;
|
||||
}
|
||||
if (node.children && node.children.length > 0) {
|
||||
const found = findCollegeById(node.children, targetId);
|
||||
if (found) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
// 确认分配
|
||||
const handleConfirm = async () => {
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
@@ -369,6 +623,21 @@ const handleConfirm = async () => {
|
||||
return;
|
||||
}
|
||||
|
||||
// 验证学院人数分配
|
||||
const totalAllocated = Object.values(allocationForm.value).reduce((sum, count) => sum + (count || 0), 0);
|
||||
if (totalAllocated !== props.selectedBeds.length) {
|
||||
ElMessage.warning(`床位分配不匹配：已分配 ${totalAllocated} 个，但选择了 ${props.selectedBeds.length} 个床位`);
|
||||
return;
|
||||
}
|
||||
|
||||
// 验证每个学院都有分配数量
|
||||
// for (const collegeId of selectedCollegeIds.value) {
|
||||
// if (!allocationForm.value[collegeId] || allocationForm.value[collegeId] <= 0) {
|
||||
// ElMessage.warning(`请为学院"${getCollegeName(collegeId)}"指定分配的床位数`);
|
||||
// return;
|
||||
// }
|
||||
// }
|
||||
|
||||
try {
|
||||
await ElMessageBox.confirm(`确定要将 ${props.selectedBeds.length} 个床位分配给 ${selectedCollegeIds.value.length} 个学院吗？`, '确认分配', {
|
||||
confirmButtonText: '确定分配',
|
||||
@@ -378,10 +647,11 @@ const handleConfirm = async () => {
|
||||
|
||||
confirmLoading.value = true;
|
||||
|
||||
// 构建分配参数
|
||||
// 构建分配参数，包含学院人数信息
|
||||
const allocationData = {
|
||||
bedIds: props.selectedBeds.map((bed) => bed.id),
|
||||
collegeIds: selectedCollegeIds.value,
|
||||
collegeStudentCounts: selectedCollegeIds.value.map((collegeId) => allocationForm.value[collegeId]),
|
||||
buildingId: props.buildingInfo?.id,
|
||||
buildingType: props.buildingInfo?.buildingType
|
||||
};
|
||||
@@ -409,6 +679,7 @@ const handleClose = () => {
|
||||
searchKey.value = '';
|
||||
confirmLoading.value = false;
|
||||
bedTreeData.value = [];
|
||||
allocationForm.value = {}; // 重置人数分配表单
|
||||
|
||||
emit('update:modelValue', false);
|
||||
};
|
||||
@@ -427,92 +698,22 @@ watch(
|
||||
// 监听床位选择变化，重新构建树形数据
|
||||
watch(
|
||||
() => props.selectedBeds,
|
||||
() => {
|
||||
(newBeds, oldBeds) => {
|
||||
buildBedTreeData();
|
||||
|
||||
// 如果床位被清空，自动清空已选择的学院
|
||||
if (newBeds.length === 0 && oldBeds && oldBeds.length > 0) {
|
||||
selectedCollegeIds.value = [];
|
||||
allocationForm.value = {};
|
||||
nextTick(() => {
|
||||
// 取消所有勾选状态
|
||||
collegeTreeRef.value?.setCheckedKeys([]);
|
||||
});
|
||||
ElMessage.info('床位已清空，已自动清空学院选择');
|
||||
}
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
// 获取勾选统计信息标题
|
||||
const getSelectionStatsTitle = () => {
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
return '未选择学院';
|
||||
}
|
||||
|
||||
if (props.buildingInfo?.buildingType === '1') {
|
||||
return `已选择 ${selectedCollegeIds.value.length} 个学院（男生楼）`;
|
||||
} else if (props.buildingInfo?.buildingType === '2') {
|
||||
return `已选择 ${selectedCollegeIds.value.length} 个学院（女生楼）`;
|
||||
}
|
||||
return `已选择 ${selectedCollegeIds.value.length} 个学院`;
|
||||
};
|
||||
|
||||
// 获取勾选统计信息描述
|
||||
const getSelectionStatsDescription = () => {
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
return '请勾选要分配的学院';
|
||||
}
|
||||
|
||||
// 计算所有勾选学院的学生统计
|
||||
let totalStudents = 0;
|
||||
let assignedStudents = 0;
|
||||
|
||||
selectedCollegeIds.value.forEach((collegeId) => {
|
||||
const college = findCollegeById(collegeTreeData.value, collegeId);
|
||||
if (college && college.type === 'college') {
|
||||
if (props.buildingInfo?.buildingType === '1') {
|
||||
// 男生楼，统计男生
|
||||
totalStudents += college.maleTotal || 0;
|
||||
assignedStudents += college.maleAssigned || 0;
|
||||
} else if (props.buildingInfo?.buildingType === '2') {
|
||||
// 女生楼，统计女生
|
||||
totalStudents += college.femaleTotal || 0;
|
||||
assignedStudents += college.femaleAssigned || 0;
|
||||
} else {
|
||||
// 混合楼，统计总数
|
||||
totalStudents += (college.maleTotal || 0) + (college.femaleTotal || 0);
|
||||
assignedStudents += (college.maleAssigned || 0) + (college.femaleAssigned || 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (props.buildingInfo?.buildingType === '1') {
|
||||
return `男生总数：${totalStudents} 人，已分配：${assignedStudents} 人，可分配：${totalStudents - assignedStudents} 人`;
|
||||
} else if (props.buildingInfo?.buildingType === '2') {
|
||||
return `女生总数：${totalStudents} 人，已分配：${assignedStudents} 人，可分配：${totalStudents - assignedStudents} 人`;
|
||||
}
|
||||
return `学生总数：${totalStudents} 人，已分配：${assignedStudents} 人，可分配：${totalStudents - assignedStudents} 人`;
|
||||
};
|
||||
|
||||
// 获取勾选统计信息类型
|
||||
const getSelectionStatsType = () => {
|
||||
if (selectedCollegeIds.value.length === 0) {
|
||||
return 'info';
|
||||
}
|
||||
|
||||
if (props.buildingInfo?.buildingType === '1') {
|
||||
return 'success';
|
||||
} else if (props.buildingInfo?.buildingType === '2') {
|
||||
return 'success';
|
||||
}
|
||||
return 'warning';
|
||||
};
|
||||
|
||||
// 递归查找学院节点
|
||||
const findCollegeById = (nodes: XgStudentTreeVO[], targetId: string | number): XgStudentTreeVO | null => {
|
||||
for (const node of nodes) {
|
||||
if (node.id === targetId) {
|
||||
return node;
|
||||
}
|
||||
if (node.children && node.children.length > 0) {
|
||||
const found = findCollegeById(node.children, targetId);
|
||||
if (found) {
|
||||
return found;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
@@ -710,4 +911,40 @@ const findCollegeById = (nodes: XgStudentTreeVO[], targetId: string | number): X
|
||||
.stats-icon {
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
/* 学院人数分配表单样式 */
|
||||
.college-allocation {
|
||||
border-top: 1px solid var(--el-border-color-light);
|
||||
padding-top: 16px;
|
||||
}
|
||||
|
||||
.allocation-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.allocation-form {
|
||||
background-color: var(--el-fill-color-lighter);
|
||||
border-radius: 6px;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.allocation-stats {
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.allocation-alert {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
/* 表单验证样式 */
|
||||
:deep(.el-form-item.is-error .el-input-number) {
|
||||
border-color: var(--el-color-danger);
|
||||
}
|
||||
|
||||
:deep(.el-form-item.is-error .el-input-number:focus-within) {
|
||||
border-color: var(--el-color-danger);
|
||||
box-shadow: 0 0 0 1px var(--el-color-danger-light-8);
|
||||
}
|
||||
</style>
|
||||
Reference in new issue
Block a user