|
|
|
@ -49,6 +49,7 @@ import java.io.*;
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
import java.util.*;
|
|
|
|
|
import java.util.function.Function;
|
|
|
|
|
import java.util.function.Predicate;
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
import static cn.hutool.core.date.DateUnit.SECOND;
|
|
|
|
@ -1202,8 +1203,10 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
|
|
|
|
|
final List<GeneralQuestionLog> list = getListBySettingIdAndSnapIds(questionSettingId, questionSnapIds, student);
|
|
|
|
|
Assert.notEmpty(list, "未查询到试卷题目信息!");
|
|
|
|
|
|
|
|
|
|
// 只取非完成状态的数据
|
|
|
|
|
Predicate<GeneralQuestionLog> notFinishPredicate = questionLog -> !questionLog.getQuestionLogAddType().equals(FINALLY_SUBMIT);
|
|
|
|
|
// 构建数据
|
|
|
|
|
List<GeneralQuestionLog> questionLogs = list.stream().map(questionLog -> {
|
|
|
|
|
List<GeneralQuestionLog> questionLogs = list.stream().filter(notFinishPredicate).map(questionLog -> {
|
|
|
|
|
GeneralQuestionLog generalQuestionLog = new GeneralQuestionLog();
|
|
|
|
|
generalQuestionLog.setGeneralQuestionLogId(questionLog.getGeneralQuestionLogId());
|
|
|
|
|
generalQuestionLog.setQuestionLogAddType(LOCK); // 锁定状态
|
|
|
|
|