diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java index 56f07f6d1..ca626f49c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java @@ -136,7 +136,7 @@ public class ExamQuestionBankController { } } } - return Result.success(examQuestionBankService.listByIds(resultList)); + return Result.success(resultList.size() > 0 ? examQuestionBankService.listByIds(resultList) : new ArrayList<>()); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java index 53e037667..db8427925 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java @@ -20,9 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version: V1.0 */ @Mapper -@DataScope public interface ExamTrainMapper extends BaseMapper { - @DataScope(includeTable = "exam_train") Page pageList(Page page, @Param(Constants.WRAPPER) Wrapper wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java index 0accaac90..b222122dc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java @@ -62,12 +62,14 @@ public class ExamTrainServiceImpl extends ServiceImpl 0) { List examTrainRecordList = examTrainRecordService.list(Wrappers.lambdaQuery().in(ExamTrainRecord::getTrainId, ids)); for (ExamTrain record : examTrainPage.getRecords()) { - List trainRecordList = examTrainRecordList.stream().filter(e -> e.getTrainId().toString().equals(record.getId().toString())).collect(Collectors.toList()); - if (trainRecordList.size() > 0) { - int complete = trainRecordList.stream().filter(t -> t.getScore() != null).collect(Collectors.toList()).size(); - int pass = trainRecordList.stream().filter(t -> t.getIsPass() == 1).collect(Collectors.toList()).size(); - record.setCompleteRadio(new BigDecimal(complete).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))); - record.setPassRadio(new BigDecimal(pass).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))); + if (record.getExamPaperId() != null) { + List trainRecordList = examTrainRecordList.stream().filter(e -> e.getTrainId().toString().equals(record.getId().toString())).collect(Collectors.toList()); + if (trainRecordList.size() > 0) { + int complete = trainRecordList.stream().filter(t -> t.getScore() != null).collect(Collectors.toList()).size(); + int pass = trainRecordList.stream().filter(t -> t.getIsPass() == 1).collect(Collectors.toList()).size(); + record.setCompleteRadio(new BigDecimal(complete).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))); + record.setPassRadio(new BigDecimal(pass).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))); + } } } }