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

Merge branch 'new-1.0' of http://62.234.217.137:3000/Big-Data-Lab/CEES-CMD into new-1.0 

# Conflicts:
#	jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesWaiTeacherServiceImpl.java
This commit is contained in:
Xubx 2025-03-19 13:45:10 +08:00
parent a06ff03e4f f6c0b3aae9
commit bdb310da38
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
int result = ceesWaiTeacherMapper.updateById(ceesWaiTeacher); int result = ceesWaiTeacherMapper.updateById(ceesWaiTeacher);
CeesDormitoryInfo ceesDormitoryInfo = null; CeesDormitoryInfo ceesDormitoryInfo = null;
// 宿舍信息数据更新 // 宿舍信息数据更新
if (result == 1) { if (result == 1 ) {
ceesDormitoryInfo = ceesDormitoryInfoMapper.selectById(dormitoryId); ceesDormitoryInfo = ceesDormitoryInfoMapper.selectById(dormitoryId);
if (ceesDormitoryInfo.getDormitoryNum() > 0) { if (ceesDormitoryInfo.getDormitoryNum() > 0) {
ceesDormitoryInfo.setDormitoryNum(ceesDormitoryInfo.getDormitoryNum() - 1); ceesDormitoryInfo.setDormitoryNum(ceesDormitoryInfo.getDormitoryNum() - 1);
@ -83,19 +83,20 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
Page<CeesWaiTeacher> page = new Page<>(pageNo, pageSize); Page<CeesWaiTeacher> page = new Page<>(pageNo, pageSize);
IPage<CeesWaiTeacher> pageList = page(page, queryWrapper); IPage<CeesWaiTeacher> pageList = page(page, queryWrapper);
Set<String> dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet()); Set<String> dormitoryIdList = pageList.getRecords().stream().map(CeesWaiTeacher::getDormitoryId).collect(Collectors.toSet());
LambdaQueryWrapper<CeesDormitoryInfo> dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).in(CeesDormitoryInfo::getId, dormitoryIdList); if (dormitoryIdList.size() > 0) {
List<CeesDormitoryInfo> ceesDormitoryInfos = ceesDormitoryInfoMapper.selectList(dormitoryWrapper); LambdaQueryWrapper<CeesDormitoryInfo> dormitoryWrapper = Wrappers.lambdaQuery(CeesDormitoryInfo.class).in(CeesDormitoryInfo::getId, dormitoryIdList);
pageList.convert(e -> { List<CeesDormitoryInfo> ceesDormitoryInfos = ceesDormitoryInfoMapper.selectList(dormitoryWrapper);
e.setDormitoryName(ceesDormitoryInfos pageList.convert(e->{
.stream() e.setDormitoryName(ceesDormitoryInfos
.filter(dormitoryInfo -> dormitoryInfo.getId().equals(e.getDormitoryId())) .stream()
.findFirst() .filter(dormitoryInfo -> dormitoryInfo.getId().equals(e.getDormitoryId()))
.orElse(new CeesDormitoryInfo()) .findFirst()
.getDormitory()); .orElse(new CeesDormitoryInfo())
e.setMajorIdDescription(MajorEnum.describe(e.getMajorId())); .getDormitory());
return e; e.setMajorIdDescription(MajorEnum.describe(e.getMajorId()));
}); return e;
; });
}
return pageList; return pageList;
} }
@ -105,10 +106,10 @@ public class CeesWaiTeacherServiceImpl extends ServiceImpl<CeesWaiTeacherMapper,
*/ */
@Override @Override
public Result cancelCheckIn(String id) { public Result cancelCheckIn(String id) {
CeesWaiTeacher ceesWaiTeacher = ceesWaiTeacherMapper.selectById(id); CeesWaiTeacher ceesWaiTeacher = ceesWaiTeacherMapper.selectById(id);
ceesWaiTeacher.setStatus(1); ceesWaiTeacher.setStatus(1);
ceesWaiTeacherMapper.updateById(ceesWaiTeacher); ceesWaiTeacherMapper.updateById(ceesWaiTeacher);
return Result.ok("撤销成功"); return Result.ok("撤销成功");
} }
/** /**