From 138cac5008689fadaa96ecac116a2297bb69bc1c Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Fri, 04 Mar 2022 10:45:40 +0800 Subject: [PATCH] 1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证生成修改 --- src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java b/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java index 5d4848b..55d4293 100644 --- a/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java +++ b/src/main/java/org/springblade/modules/simulateexam/service/impl/SimulateExamRecordServiceImpl.java @@ -105,13 +105,13 @@ List<ExamSubjectChoicesVO> radioRandomSubjectList = examPaperService.queryRandomSubjectList(radio,25); List<ExamSubjectChoicesVO> checkboxRandomSubjectList = examPaperService.queryRandomSubjectList(checkbox,10); List<ExamSubjectChoicesVO> judgeRandomSubjectList = examPaperService.queryRandomSubjectList(judge,20); -// List<ExamSubjectChoicesVO> sortRandomSubjectList = examPaperService.queryRandomSubjectList(sort,5); + List<ExamSubjectChoicesVO> sortRandomSubjectList = examPaperService.queryRandomSubjectList(sort,5); //合并集合数据 choicesVOList.addAll(radioRandomSubjectList); choicesVOList.addAll(checkboxRandomSubjectList); choicesVOList.addAll(judgeRandomSubjectList); -// choicesVOList.addAll(sortRandomSubjectList); + choicesVOList.addAll(sortRandomSubjectList); //取出考试id List<Long> longList = choicesVOList.stream().map(ExamSubjectChoicesVO::getId).collect(Collectors.toList()); -- Gitblit v1.9.3