diff --git a/src/main/java/com/project/classicpaper/application/impl/ClassicPaperSetApplicationServiceImpl.java b/src/main/java/com/project/classicpaper/application/impl/ClassicPaperSetApplicationServiceImpl.java index 68ebf71..4b2f61a 100644 --- a/src/main/java/com/project/classicpaper/application/impl/ClassicPaperSetApplicationServiceImpl.java +++ b/src/main/java/com/project/classicpaper/application/impl/ClassicPaperSetApplicationServiceImpl.java @@ -74,7 +74,9 @@ public class ClassicPaperSetApplicationServiceImpl implements ClassicPaperSetApp public Result> list(ClassicPaperSetParam param) { Page page = new Page<>( param.getCurrent() == null ? 1 : param.getCurrent(), - param.getSize() == null ? 10 : param.getSize()); + param.getNoPage() != null && param.getNoPage() + ? Integer.MAX_VALUE + : (param.getSize() == null ? 10 : param.getSize())); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (param.getSubLineId() != null) { diff --git a/src/main/java/com/project/classicpaper/domain/param/ClassicPaperSetParam.java b/src/main/java/com/project/classicpaper/domain/param/ClassicPaperSetParam.java index ac62a45..0d4483d 100644 --- a/src/main/java/com/project/classicpaper/domain/param/ClassicPaperSetParam.java +++ b/src/main/java/com/project/classicpaper/domain/param/ClassicPaperSetParam.java @@ -22,4 +22,7 @@ public class ClassicPaperSetParam extends BaseParam { /** 套题名称(模糊搜索) */ private String name; + + /** 不分页,返回全部数据(默认 false 分页) */ + private Boolean noPage; } diff --git a/src/main/java/com/project/exam/domain/param/ExamRecordParam.java b/src/main/java/com/project/exam/domain/param/ExamRecordParam.java index d8db31f..5ed8287 100644 --- a/src/main/java/com/project/exam/domain/param/ExamRecordParam.java +++ b/src/main/java/com/project/exam/domain/param/ExamRecordParam.java @@ -13,4 +13,6 @@ public class ExamRecordParam extends BaseParam { private String subLineName; + private Long taskId; + } diff --git a/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java b/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java index 2ea1e8b..baa22f3 100644 --- a/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java +++ b/src/main/java/com/project/exam/domain/service/impl/AdminSearchExamRecordDomainServiceImpl.java @@ -65,6 +65,11 @@ public class AdminSearchExamRecordDomainServiceImpl implements AdminSearchExamRe if (StrUtil.isNotBlank(param.getTaskName())) { queryWrapper.like(ExamRecordEntity::getTaskName , param.getTaskName()); } + if (Objects.nonNull(param.getTaskId())) { + // 使用 inSql 构造子查询:WHERE task_user_id IN (SELECT id FROM evaluator_task_user WHERE task_id = ?) + queryWrapper.inSql(ExamRecordEntity::getTaskUserId, + String.format("SELECT id FROM evaluator_task_user WHERE task_id = %d", param.getTaskId())); + } if (StrUtil.isNotBlank(param.getSubLineName())) { List productLineEntityList = productLineBaseService.lambdaQuery().select(ProductLineEntity::getId)