|
@@ -146,6 +146,12 @@ public class OutletScoreServiceImpl implements OutletScoreService{
|
|
|
for(OeExamStudentBean examStudent:examStudents){
|
|
|
OutletScore outletScore = new OutletScore(examStudent);
|
|
|
outletScore = findExamData(outletScore,examStudent);
|
|
|
+
|
|
|
+ GetExamReq getExamReq = new GetExamReq();
|
|
|
+ getExamReq.setId(outletScore.getExamId());
|
|
|
+ GetExamResp getExamResp = examCloudService.getExam(getExamReq);
|
|
|
+ outletScore.setExamName(getExamResp.getExamBean().getName());
|
|
|
+
|
|
|
outletScoreList.add(outletScore);
|
|
|
}
|
|
|
return outletScoreList;
|
|
@@ -227,7 +233,7 @@ public class OutletScoreServiceImpl implements OutletScoreService{
|
|
|
* 2.没有警告的或有警告已审核通过的
|
|
|
*/
|
|
|
Stream<ExamRecordForSelectScore> secondFilterExamRecordStream = firstFilterExamRecordList.stream().filter(examRecord -> {
|
|
|
- return examRecord.getIsIllegality() &&
|
|
|
+ return !examRecord.getIsIllegality() &&
|
|
|
(!examRecord.getIsWarn() || (examRecord.getIsWarn() && examRecord.getIsAudit()));
|
|
|
});
|
|
|
|