Big-Data-Lab
/
CEES-CMD
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

宿舍分配优化：只能分配所属学科的宿舍

This commit is contained in:
Xubx 2025-05-19 15:28:03 +08:00
parent a2c80ba34d
commit a92fdf126e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java
View File

@ -96,8 +96,8 @@ public class CeesDormitoryInfoController extends JeecgController<CeesDormitoryIn
* @return
*/
@RequestMapping(value = "/selectBySex")
public Result<JSONArray> selectBySex(@RequestParam(name="sex",required=true) String sex) {
return ceesDormitoryInfoService.selectBySex(sex);
public Result<JSONArray> selectBySex(@RequestParam(name="sex",required=true) String sex, @RequestParam(name="majorId") Integer majorId) {
return ceesDormitoryInfoService.selectBySex(sex, majorId);
}
/**
* 通过id删除

2
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java
View File

@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
*/
public interface ICeesDormitoryInfoService extends IService<CeesDormitoryInfo> {
Result<JSONArray> selectBySex(String sex);
Result<JSONArray> selectBySex(String sex, Integer majorId);
IPage<CeesDormitoryInfo> queryPageList(CeesDormitoryInfo ceesDormitoryInfo, Integer pageNo, Integer pageSize, HttpServletRequest req);
}

5
jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java
View File

@ -46,7 +46,7 @@ public class CeesDormitoryInfoServiceImpl extends ServiceImpl<CeesDormitoryInfoM
SysUserRoleMapper sysUserRoleMapper;
@Override
public Result<JSONArray> selectBySex(String sex) {
public Result<JSONArray> selectBySex(String sex, Integer majorId) {
//todo: 未添加宿舍满员的情况和宿舍是否正常使用
Integer type = Integer.parseInt(sex);
LambdaQueryWrapper<CeesDormitoryInfo> wrapper = new LambdaQueryWrapper<>();
@ -54,6 +54,9 @@ public class CeesDormitoryInfoServiceImpl extends ServiceImpl<CeesDormitoryInfoM
if (sex != null) {
wrapper.eq(CeesDormitoryInfo::getDormitoryType, type);
}
if (majorId != null) {
wrapper.eq(CeesDormitoryInfo::getMajorId, majorId);
}
List<CeesDormitoryInfo> list = ceesDormitoryInfoMapper.selectList(wrapper);
JSONArray resultArray = new JSONArray();
for (CeesDormitoryInfo dorm : list) {