beetlsql3-dev
Mlxa0324 2 years ago
parent 51f40f9343
commit 49c81405ee

@ -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.convertData;
import static com.ibeetl.admin.core.util.ExcelUtil.write; import static com.ibeetl.admin.core.util.ExcelUtil.write;
import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser; 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("isErrorFavorite", true);
query.setPara("generalQuestionSettingIdPlural", questionSettingIds); query.setPara("generalQuestionSettingIdPlural", questionSettingIds);
query.setPara("questionLogAddType", FINALLY_SUBMIT);
return JsonResult.success(generalQuestionLogService.queryByConditionQuery(query)); return JsonResult.success(generalQuestionLogService.queryByConditionQuery(query));
} }

@ -587,11 +587,10 @@ public class ResourcesQuestionController{
* @param courseId * @param courseId
* @return * @return
*/ */
@GetMapping(MODEL + "/getGroupQuestionTypeCount.json") @GetMapping(MODEL + "/questionTypeGroupInfo.json")
@Function("resourcesQuestion.query") @Function("resourcesQuestion.query")
@ResponseBody @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)); return JsonResult.success(resourcesQuestionService.getGroupQuestionTypeCount(courseId));
} }
} }

@ -478,7 +478,6 @@ public class TeacherOpenCourseMergeResourcesQuestionController extends BaseContr
*/ */
@PostMapping(API + "/questionTypeGroupInfo.do") @PostMapping(API + "/questionTypeGroupInfo.do")
public JsonResult questionTypeGroupInfo(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) { public JsonResult questionTypeGroupInfo(Long teacherOpenCourseId, @SCoreUser CoreUser coreUser) {
return JsonResult.success(teacherOpenCourseMergeResourcesQuestionService.getGroupQuestionTypeCount(teacherOpenCourseId)); return JsonResult.success(teacherOpenCourseMergeResourcesQuestionService.getGroupQuestionTypeCount(teacherOpenCourseId));
} }

Loading…
Cancel
Save