|
@@ -72,7 +72,7 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordDao, CheckRec
|
|
if (id != null) {
|
|
if (id != null) {
|
|
checkRecord = this.getById(id);
|
|
checkRecord = this.getById(id);
|
|
} else {
|
|
} else {
|
|
- checkRecord = findByGroupTypeAndGroupName(exam.getGroupType(), groupName);
|
|
|
|
|
|
+ checkRecord = findByGroupTypeAndGroupName(examId, exam.getGroupType(), groupName);
|
|
}
|
|
}
|
|
if (!checkRecord.getGroupName().equals(groupName)) {
|
|
if (!checkRecord.getGroupName().equals(groupName)) {
|
|
throw new StatusException("该分组开始考生不正确");
|
|
throw new StatusException("该分组开始考生不正确");
|
|
@@ -119,7 +119,7 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordDao, CheckRec
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public CheckRecordEntity findByGroupTypeAndGroupName(GroupType type, String groupName) {
|
|
|
|
|
|
+ public CheckRecordEntity findByGroupTypeAndGroupName(Long examId, GroupType type, String groupName) {
|
|
if (type == null) {
|
|
if (type == null) {
|
|
throw new StatusException("分组类型不能为空");
|
|
throw new StatusException("分组类型不能为空");
|
|
}
|
|
}
|
|
@@ -128,6 +128,7 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordDao, CheckRec
|
|
}
|
|
}
|
|
QueryWrapper<CheckRecordEntity> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<CheckRecordEntity> wrapper = new QueryWrapper<>();
|
|
LambdaQueryWrapper<CheckRecordEntity> lw = wrapper.lambda();
|
|
LambdaQueryWrapper<CheckRecordEntity> lw = wrapper.lambda();
|
|
|
|
+ lw.eq(CheckRecordEntity::getExamId, examId);
|
|
lw.eq(CheckRecordEntity::getGroupType, type);
|
|
lw.eq(CheckRecordEntity::getGroupType, type);
|
|
lw.eq(CheckRecordEntity::getGroupName, groupName);
|
|
lw.eq(CheckRecordEntity::getGroupName, groupName);
|
|
CheckRecordEntity entity = this.getOne(wrapper);
|
|
CheckRecordEntity entity = this.getOne(wrapper);
|