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

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-05-24 16:55:52 +08:00
commit 66fd160ae2
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
*/
@Mapper
@DataScope
public interface ExamTrainMapper extends BaseMapper<ExamTrain> {
@DataScope(includeTable = "exam_train")
Page<ExamTrain> pageList(Page page, @Param(Constants.WRAPPER) Wrapper<ExamTrain> wrapper);
}

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

@ -62,6 +62,7 @@ public class ExamTrainServiceImpl extends ServiceImpl<ExamTrainMapper, ExamTrain
if (ids.size() > 0) {
List<ExamTrainRecord> examTrainRecordList = examTrainRecordService.list(Wrappers.<ExamTrainRecord>lambdaQuery().in(ExamTrainRecord::getTrainId, ids));
for (ExamTrain record : examTrainPage.getRecords()) {
if (record.getExamPaperId() != null) {
List<ExamTrainRecord> 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();
@ -71,6 +72,7 @@ public class ExamTrainServiceImpl extends ServiceImpl<ExamTrainMapper, ExamTrain
}
}
}
}
return examTrainPage;
}