From 6ba077ce50e885b819fbf3e260cee4e5fbb5df8d Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 30 Nov 2022 21:47:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jlw/entity/dto/GeneralQuestionTestSimpleInfoDTO.java | 7 ++-----
.../com/ibeetl/jlw/service/ResourcesQuestionService.java | 5 +++--
.../ibeetl/jlw/web/GeneralQuestionSettingController.java | 2 +-
.../com/ibeetl/jlw/web/ResourcesQuestionController.java | 5 +++--
.../resources/sql/jlw/generalResourcesQuestionSnapshot.md | 3 ++-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/dto/GeneralQuestionTestSimpleInfoDTO.java b/web/src/main/java/com/ibeetl/jlw/entity/dto/GeneralQuestionTestSimpleInfoDTO.java
index 8ab6362d..f16b8c13 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/dto/GeneralQuestionTestSimpleInfoDTO.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/dto/GeneralQuestionTestSimpleInfoDTO.java
@@ -25,12 +25,9 @@ import javax.validation.constraints.NotNull;
public class GeneralQuestionTestSimpleInfoDTO extends PageParam {
/**
- * 系统的 课程ID
+ * 系统的 课程父ID
*/
- @NotNull(message = "课程ID不能为空！", groups = ValidateConfig.ADD.class)
- private Long courseId;
-
-
+ private Long courseInfoParentId;
/**
* 题目配置类型
*/
diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java
index e57df13f..795b4ef9 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java
@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Nullable;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.*;
@@ -759,10 +760,10 @@ public class ResourcesQuestionService extends CoreBaseService<ResourcesQuestion>
/**
* 根据开课ID获取下面的题目类型和类型下的总题数
- * @param courseId
+ * @param courseId 可为空
* @return
*/
- public List<QuestionTypeCountVO> getGroupQuestionTypeCount(@NotNull(message = "开课ID不能为空！") Long courseId) {
+ public List<QuestionTypeCountVO> getGroupQuestionTypeCount(@Nullable Long courseId) {
List<QuestionTypeCountVO> g = resourcesQuestionDao.getGroupQuestionTypeCount(courseId);
dictParser(g);
return g;
diff --git a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java
index 213ae083..9f0d3900 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java
@@ -192,7 +192,7 @@ public class GeneralQuestionSettingController{
CourseInfoQuery courseInfoQuery = new CourseInfoQuery();
courseInfoQuery.setCourseInfoStatus(1); courseInfoQuery.setCourseInfoType(1);
courseInfoQuery.setCourseLabelTypes("考证课程类");
- view.addObject("bussinessIdList", defaultIfNull(courseInfoService.getValues(courseInfoQuery), Collections.emptyList()));
+ view.addObject("businessIdList", defaultIfNull(courseInfoService.getValues(courseInfoQuery), Collections.emptyList()));
// 班级列表
SchoolClassQuery schoolClassQuery = new SchoolClassQuery();
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 f99ee982..2992cc21 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java
@@ -32,6 +32,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
@@ -583,13 +584,13 @@ public class ResourcesQuestionController{
/**
* 查询题目类型下的题目数量
- * @param courseId
+ * @param courseId 非必传
* @return
*/
@GetMapping(MODEL + "/getGroupQuestionTypeCount.json")
@Function("resourcesQuestion.query")
@ResponseBody
- public JsonResult<List<QuestionTypeCountVO>> getGroupQuestionTypeCount(Long courseId) {
+ public JsonResult<List<QuestionTypeCountVO>> getGroupQuestionTypeCount(@RequestParam(required = false) Long courseId) {
return JsonResult.success(resourcesQuestionService.getGroupQuestionTypeCount(courseId));
}
diff --git a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md
index cfc560f7..9d476f44 100644
--- a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md
+++ b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md
@@ -880,12 +880,13 @@ getQuestionTestSimpleInfo
@}
FROM
general_question_setting t
+ left join course_info za on za.course_info_id = t.business_id and t.business_type = 'FROM_SYSTEM'
WHERE
1 = 1
AND t.general_question_setting_type = #generalQuestionSettingType#
AND t.general_question_setting_push_status = 1
AND t.general_question_setting_status = 1
- AND t.business_id = #courseId#
+ AND za.course_info_parent_id = #courseInfoParentId#
order by t.general_question_setting_name asc