1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证...

Administrator

2022-03-04 138cac5008689fadaa96ecac116a2297bb69bc1c

 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());