beetlsql3-dev
Mlxa0324 2 years ago
parent 3511a7808c
commit 5a89ea13ae

@ -696,17 +696,7 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
logQuery.setGeneralQuestionSettingId(questionSettingId);
List<GeneralQuestionLog> list = generalQuestionLogService.getValuesByQueryNotWithPermission(logQuery);
list.forEach(item -> {
item.likeQuestionSnapshotInit();
if (TUCK_TEST.equals(tuckOrError)) {
item.setQuestionLogAddType(TUCK_TEST_INIT);
} else if(ERROR_TEST.equals(tuckOrError)) {
item.setQuestionLogAddType(ERROR_TEST_INIT);
}
});
if (ObjectUtil.isNotEmpty(list)) {
generalQuestionLogService.insertBatch(list);
return BeanUtil.copyToList(list, GeneralResourcesQuestionSnapshot.class);
}

@ -44,7 +44,8 @@ import java.util.stream.Collectors;
import static cn.hutool.core.text.CharSequenceUtil.join;
import static cn.jlw.util.CacheUserUtil.getStudent;
import static cn.jlw.util.QuestionUtil.shuffleQuestion;
import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.*;
import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.FINALLY_SUBMIT;
import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.PRE_SUBMIT;
import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.CHAPTER_EXERCISE;
import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.HOMEWORK_FILE;
import static com.ibeetl.jlw.enums.TuckOrErrorEnum.ERROR_TEST;
@ -834,17 +835,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
logQuery.setTeacherOpenCourseQuestionSettingId(questionSettingId);
List<TeacherOpenCourseQuestionLog> list = teacherOpenCourseQuestionLogService.getValuesByQueryNotWithPermission(logQuery);
list.forEach(item -> {
item.likeQuestionSnapshotInit();
if (TUCK_TEST.equals(tuckOrError)) {
item.setQuestionLogAddType(TUCK_TEST_INIT);
} else if(ERROR_TEST.equals(tuckOrError)) {
item.setQuestionLogAddType(ERROR_TEST_INIT);
}
});
if (ObjectUtil.isNotEmpty(list)) {
teacherOpenCourseQuestionLogService.insertBatch(list);
return BeanUtil.copyToList(list, ResourcesQuestionSnapshot.class);
}

@ -12,7 +12,6 @@ import com.ibeetl.admin.core.service.CoreUserService;
import com.ibeetl.admin.core.util.HttpRequestLocal;
import com.ibeetl.jlw.entity.Student;
import com.ibeetl.jlw.entity.Teacher;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -117,7 +116,7 @@ public class WebPlatformService {
}
// Token存储
if (ObjectUtils.isNotEmpty(token)) {
if (ObjectUtil.isNotEmpty(token)) {
tokenSessionMap.put(token, new Object[]{user, currentOrg, orgs, null});
}
return token;

Loading…
Cancel
Save