admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
pengjie 2024-05-24 14:50:19 +08:00
parent 81104a72b2
commit f7669c0d40
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java
View File

@ -136,7 +136,7 @@ public class ExamQuestionBankController {
} }
} }
} }
return Result.success(examQuestionBankService.listByIds(resultList)); return Result.success(resultList.size() > 0 ? examQuestionBankService.listByIds(resultList) : new ArrayList<>());
} }

2
src/main/java/com/zhgd/xmgl/modules/exam/mapper/ExamTrainMapper.java
View File

@ -20,9 +20,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @version： V1.0 * @version： V1.0
*/ */
@Mapper @Mapper
@DataScope
public interface ExamTrainMapper extends BaseMapper<ExamTrain> { public interface ExamTrainMapper extends BaseMapper<ExamTrain> {
@DataScope(includeTable = "exam_train")
Page<ExamTrain> pageList(Page page, @Param(Constants.WRAPPER) Wrapper<ExamTrain> wrapper); Page<ExamTrain> pageList(Page page, @Param(Constants.WRAPPER) Wrapper<ExamTrain> wrapper);
} }

14
src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java
View File

@ -62,12 +62,14 @@ public class ExamTrainServiceImpl extends ServiceImpl<ExamTrainMapper, ExamTrain
if (ids.size() > 0) { if (ids.size() > 0) {
List<ExamTrainRecord> examTrainRecordList = examTrainRecordService.list(Wrappers.<ExamTrainRecord>lambdaQuery().in(ExamTrainRecord::getTrainId, ids)); List<ExamTrainRecord> examTrainRecordList = examTrainRecordService.list(Wrappers.<ExamTrainRecord>lambdaQuery().in(ExamTrainRecord::getTrainId, ids));
for (ExamTrain record : examTrainPage.getRecords()) { for (ExamTrain record : examTrainPage.getRecords()) {
List<ExamTrainRecord> trainRecordList = examTrainRecordList.stream().filter(e -> e.getTrainId().toString().equals(record.getId().toString())).collect(Collectors.toList()); if (record.getExamPaperId() != null) {
if (trainRecordList.size() > 0) { List<ExamTrainRecord> trainRecordList = examTrainRecordList.stream().filter(e -> e.getTrainId().toString().equals(record.getId().toString())).collect(Collectors.toList());
int complete = trainRecordList.stream().filter(t -> t.getScore() != null).collect(Collectors.toList()).size(); if (trainRecordList.size() > 0) {
int pass = trainRecordList.stream().filter(t -> t.getIsPass() == 1).collect(Collectors.toList()).size(); int complete = trainRecordList.stream().filter(t -> t.getScore() != null).collect(Collectors.toList()).size();
record.setCompleteRadio(new BigDecimal(complete).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))); int pass = trainRecordList.stream().filter(t -> t.getIsPass() == 1).collect(Collectors.toList()).size();
record.setPassRadio(new BigDecimal(pass).divide(new BigDecimal(trainRecordList.size()), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))); 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)));
}
} }
} }
} }