From 455f541aff50ceb9dbbbe9b94e3d286ad177369a Mon Sep 17 00:00:00 2001
From: yangdj <18302547071@163>
Date: Tue, 21 Mar 2023 21:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=81=E8=BE=85=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/jlw/web/CourseInfoController.java   |  2 +-
 web/src/main/resources/sql/jlw/courseInfo.md       | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java
index 38b36151..a4cb7d34 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java
@@ -83,7 +83,7 @@ public class CourseInfoController{
      */
     @PostMapping(API + "/examCourseQuestion.do")
     @ResponseBody
-    public JsonResult examCourseQuestion(CourseInfoQuery query, @SCoreUser CoreUser coreUser) {
+    public JsonResult<PageQuery> examCourseQuestion(CourseInfoQuery query, @SCoreUser CoreUser coreUser) {
         return JsonResult.success(courseInfoService.examCourseQuestionDO(query.getPageQuery()));
     }
 
diff --git a/web/src/main/resources/sql/jlw/courseInfo.md b/web/src/main/resources/sql/jlw/courseInfo.md
index d1474c46..697da18f 100644
--- a/web/src/main/resources/sql/jlw/courseInfo.md
+++ b/web/src/main/resources/sql/jlw/courseInfo.md
@@ -708,11 +708,13 @@ examCourseQuestionDO
 * 只获取考证类的课程，如果配置试卷题目的话，就查询出来。
 
   SELECT
+  @pageTag(){
   t.*,
-  @// 关联的题目总数量
-  ( SELECT count( 1 ) FROM general_resources_question_snapshot tb 
-    WHERE tb.business_course_info_id = t.course_info_id 
-      AND tb.general_question_setting_id = ta.general_question_setting_id AND tb.question_status = 1) AS question_count
+    @// 关联的题目总数量
+    ( SELECT count( 1 ) FROM general_resources_question_snapshot tb
+    WHERE tb.business_course_info_id = t.course_info_id
+    AND tb.general_question_setting_id = ta.general_question_setting_id AND tb.question_status = 1) AS question_count
+  @}
   FROM
   course_info t
   LEFT JOIN course_label tb on tb.course_label_id = t.course_label_id
@@ -741,10 +743,10 @@ examCourseQuestionDO
   and t.course_label_id =#courseLabelId#
   @}
   @if(!isEmpty(courseLabelType)){
-  and a.course_label_type like #'%'+courseLabelType+'%'#
+  and tb.course_label_type like #'%'+courseLabelType+'%'#
   @}
   @if(!isEmpty(courseLabelTypes)){
-  and find_in_set(a.course_label_type,#courseLabelTypes#)
+  and find_in_set(tb.course_label_type,#courseLabelTypes#)
   @}
   @if(!isEmpty(courseInfoBasicsCount)){
   and t.course_info_basics_count =#courseInfoBasicsCount#