From 49c81405ee811d3ec00f88062e017290d41998c8 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 5 Dec 2022 22:15:59 +0800
Subject: [PATCH] 123
---
.../com/ibeetl/jlw/web/GeneralQuestionLogController.java | 2 ++
.../java/com/ibeetl/jlw/web/ResourcesQuestionController.java | 5 ++---
.../TeacherOpenCourseMergeResourcesQuestionController.java | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java
index 4002f367..fafd7fa5 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionLogController.java
@@ -47,6 +47,7 @@ import static cn.jlw.util.CacheUserUtil.getStudent;
import static com.ibeetl.admin.core.util.ExcelUtil.convertData;
import static com.ibeetl.admin.core.util.ExcelUtil.write;
import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
+import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.FINALLY_SUBMIT;
/**
* 通用做题日志 题库-通用做题日志 接口
@@ -297,6 +298,7 @@ public class GeneralQuestionLogController extends BaseController {
// 只查询收藏到错题库的题目
query.setPara("isErrorFavorite", true);
query.setPara("generalQuestionSettingIdPlural", questionSettingIds);
+ query.setPara("questionLogAddType", FINALLY_SUBMIT);
return JsonResult.success(generalQuestionLogService.queryByConditionQuery(query));
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
index 2992cc21..ba03e0eb 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
@@ -587,11 +587,10 @@ public class ResourcesQuestionController{
* @param courseId 非必传
* @return
*/
- @GetMapping(MODEL + "/getGroupQuestionTypeCount.json")
+ @GetMapping(MODEL + "/questionTypeGroupInfo.json")
@Function("resourcesQuestion.query")
@ResponseBody
- public JsonResult<List<QuestionTypeCountVO>> getGroupQuestionTypeCount(@RequestParam(required = false) Long courseId) {
+ public JsonResult<List<QuestionTypeCountVO>> questionTypeGroupInfo(@RequestParam(required = false) Long courseId) {
return JsonResult.success(resourcesQuestionService.getGroupQuestionTypeCount(courseId));
}
-
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java
index dacb7974..a07c6e5e 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesQuestionController.java
@@ -478,7 +478,6 @@ public class TeacherOpenCourseMergeResourcesQuestionController extends BaseContr
*/
@PostMapping(API + "/questionTypeGroupInfo.do")
public JsonResult questionTypeGroupInfo(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) {
-
return JsonResult.success(teacherOpenCourseMergeResourcesQuestionService.getGroupQuestionTypeCount(teacherOpenCourseId));
}