1、试题管理

web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java

@@ -53,4 +53,11 @@ public interface ResourcesQuestionDao extends BaseMapper<ResourcesQuestion>{
 
     List<QuestionSettingDTO> getGroupQuestionTypeCountAndSelectInfo(Long courseInfoId, Long questionSettingId);
 
+    /**
+     * 试题管理系统+院校
+     * @param query
+     * @return
+     */
+    PageQuery<ResourcesQuestion> getTestItemManageSystemOAndUniversities(PageQuery query);
+
 }

web/src/main/java/com/ibeetl/jlw/entity/ResourcesQuestion.java

@@ -101,6 +101,14 @@ public class ResourcesQuestion extends BaseEntity{
 
     private AddTypeEnum addType ;
 
+    //题库来源
+    private String addTypeText;
+
+    /**
+     * 试题来源 1 教师新增 2 系统新增
+     */
+    private String sourceType;
+
     /**
      * 新增时间
      */
@@ -308,6 +316,30 @@ public class ResourcesQuestion extends BaseEntity{
         this.addType = addType;
     }
 
+    public String getAddTypeText() {
+        return addTypeText;
+    }
+
+    public void setAddTypeText(String addTypeText) {
+        this.addTypeText = addTypeText;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType;
+    }
+
     /**题干, 图片转换成正则
      *@return
      */

web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java

@@ -121,6 +121,12 @@ public class ResourcesQuestionService extends CoreBaseService<ResourcesQuestion>
         return ret;
     }
 
+    public PageQuery<ResourcesQuestion> getTestItemManageSystemOAndUniversities(PageQuery query) {
+        PageQuery ret = resourcesQuestionDao.getTestItemManageSystemOAndUniversities(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+
     public void deleteResourcesQuestion(String ids) {
         String courseInfoIds = "";
         List<ResourcesQuestion> list = getByIds(ids);

web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionController.java

@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.web;
 
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.GetFile;
 import cn.jlw.Interceptor.RFile;
@@ -22,6 +23,7 @@ import com.ibeetl.jlw.enums.MatchTypeEnum;
 import com.ibeetl.jlw.enums.QuestionBusinessTypeEnum;
 import com.ibeetl.jlw.service.CourseInfoService;
 import com.ibeetl.jlw.service.ResourcesQuestionService;
+import com.ibeetl.jlw.service.TeacherOpenCourseMergeResourcesQuestionService;
 import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService;
 import com.ibeetl.jlw.web.query.CourseInfoQuery;
 import com.ibeetl.jlw.web.query.ResourcesQuestionQuery;
@@ -68,13 +70,19 @@ public class ResourcesQuestionController{
     private static final String API = "/api/resourcesQuestion";
 
 
-    @Autowired private ResourcesQuestionService resourcesQuestionService;
+    @Autowired
+    private ResourcesQuestionService resourcesQuestionService;
 
     @Autowired
     FileService fileService;
 
-    @Autowired private CourseInfoService courseInfoService;
-    @Autowired private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService;
+    @Autowired
+    private CourseInfoService courseInfoService;
+    @Autowired
+    private UniversitiesCollegesJurisdictionCurriculumResourcesService universitiesCollegesJurisdictionCurriculumResourcesService;
+
+    @Autowired
+    private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
 
     /* 前端接口 */
 
@@ -194,7 +202,11 @@ public class ResourcesQuestionController{
             // 如果为空字符串，那么代表这个学校，还没有授权的课程，所以是不会显示任何东西的。
             condition.setCourseInfoIds(StrUtil.blankToDefault(ids, "未授权应用"));
         }
+        if (coreUser.isAdmin()) {
+            resourcesQuestionService.getTestItemManageSystemOAndUniversities(page);
+        } else {
             resourcesQuestionService.queryByCondition(page);
+        }
         return JsonResult.success(page);
     }
 
@@ -245,8 +257,7 @@ public class ResourcesQuestionController{
 
                 if (coreUser.isAdmin()) {
                     resourcesQuestion.setAddType(AddTypeEnum.ADMIN_ADD);
-                }
-                else {
+                } else {
                     resourcesQuestion.setAddType(AddTypeEnum.FACULTY_ADD);
                 }
                 resourcesQuestion.setOrgId(coreUser.getOrgId());
@@ -268,6 +279,13 @@ public class ResourcesQuestionController{
     public JsonResult<String> putOnShelves(@Validated(ValidateConfig.UPDATE.class) ResourcesQuestion resourcesQuestion, BindingResult result) {
         if (result.hasErrors()) {
             return JsonResult.failMessage(result);
+        } else {
+            if (ObjectUtil.equals(resourcesQuestion.getSourceType(), 1)) {
+                if (ObjectUtil.isEmpty(resourcesQuestion.getResourcesQuestionId())) {
+                    return JsonResult.failMessage("更新失败");
+                }
+                teacherOpenCourseMergeResourcesQuestionService.batchEditUpDownStatus(resourcesQuestion.getResourcesQuestionId().toString(), resourcesQuestion.getQuestionStatus());
+                return JsonResult.success();
             } else {
                 boolean success = resourcesQuestionService.edit(resourcesQuestion);
                 if (success) {
@@ -276,6 +294,8 @@ public class ResourcesQuestionController{
                     return JsonResult.failMessage("更新失败");
                 }
             }
+
+        }
     }
 
 
@@ -362,6 +382,7 @@ public class ResourcesQuestionController{
 
     /**
      * 验证是否有操作该数据的权限
+     *
      * @param resourcesQuestion
      * @param coreUser
      */
@@ -569,6 +590,7 @@ public class ResourcesQuestionController{
 
     /**
      * 设置有效性
+     *
      * @param offset 主影响单元格所在列，即此单元格由哪个单元格影响联动
      * @param sheet
      * @param rowNum 行数
@@ -600,11 +622,11 @@ public class ResourcesQuestionController{
 
     /**
      * 计算formula
+     *
      * @param offset   偏移量，如果给0，表示从A列开始，1，就是从B列
      * @param rowId    第几行
      * @param colCount 一共多少列
      * @return 如果给入参 1,1,10. 表示从B1-K1。最终返回 $B$1:$K$1
-     *
      */
     public static String getRange(int offset, int rowId, int colCount) {
         char start = (char) ('A' + offset);
@@ -695,6 +717,7 @@ public class ResourcesQuestionController{
 
     /**
      * 查询题目类型下的题目数量
+     *
      * @param courseInfoQuery 课程信息
      * @return
      */
@@ -742,6 +765,7 @@ public class ResourcesQuestionController{
 
     /**
      * 教师端-题目配置页-题目设置-获取题目类型
+     *
      * @param courseInfoQuery 题目信息
      * @param coreUser
      * @return
@@ -755,6 +779,7 @@ public class ResourcesQuestionController{
     /**
      * 教师端-题目配置页-题目设置-获取题目类型
      * 此接口只获取理论课程类的题目类型和数量
+     *
      * @param courseInfoQuery       课程信息查询
      * @param courseLabelTypePlural 课程分类标签  考证课程类 等等
      * @param seeAdminAndSelf       除了超管，其他身份需要传true

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionQuery.java

@@ -71,6 +71,10 @@ public class ResourcesQuestionQuery extends PageParam {
     private Long courseInfoId_0;
     private Long courseInfoId_1;
 
+
+    //题库来源
+    private String addTypeText;
+
     /**
      * 新增时间
      */
@@ -313,4 +317,12 @@ public class ResourcesQuestionQuery extends PageParam {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public String getAddTypeText() {
+        return addTypeText;
+    }
+
+    public void setAddTypeText(String addTypeText) {
+        this.addTypeText = addTypeText;
+    }
 }

web/src/main/resources/sql/jlw/resourcesQuestion.md

@@ -542,3 +542,97 @@ getGroupQuestionTypeCountAndSelectInfo
   ORDER BY
   t.question_type ASC
   ) z
+
+
+getTestItemManageSystemOAndUniversities
+===
+* 试题管理系统+院校
+  SELECT
+  @pageTag(){
+  tt.*
+  @}
+  FROM
+  (
+  (
+  SELECT
+  a.add_time,
+  '超级管理员' AS add_type_text,
+  a.course_info_id,
+  aa.course_info_name AS course_info_name,
+  ab.course_info_id AS course_info_parent_id,
+  ab.course_info_name AS course_info_parent_name,
+  a.org_id,
+  ac.`NAME` AS org_id_text,
+  a.question_analysis,
+  a.question_answer,
+  a.question_option_a,
+  a.question_option_b,
+  a.question_option_c,
+  a.question_option_d,
+  a.question_option_e,
+  a.question_score,
+  a.question_status,
+  a.question_stem,
+  a.question_type,
+  a.resources_question_id,
+  a.user_id,
+  '2' AS source_type
+  FROM
+  resources_question a
+  LEFT JOIN course_info aa ON aa.course_info_id = a.course_info_id
+  LEFT JOIN course_info ab ON ab.course_info_id = aa.course_info_parent_id
+  LEFT JOIN core_org ac ON ac.ID = a.org_id
+  )
+
+UNION ALL
+
+(
+SELECT
+b.add_time,
+bc.`NAME` AS add_type_text,
+b.teacher_open_course_merge_course_info_id AS course_info_id,
+ba.course_info_name AS course_info_name,
+bb.teacher_open_course_id AS course_info_parent_id,
+bb.course_info_name AS course_info_parent_name,
+b.org_id,
+bc.`NAME` AS org_id_text,
+b.question_analysis,
+b.question_answer,
+b.question_option_a,
+b.question_option_b,
+b.question_option_c,
+b.question_option_d,
+b.question_option_e,
+b.question_score,
+b.question_status,
+b.question_stem,
+b.question_type,
+b.teacher_open_course_merge_resources_question_id AS resources_question_id,
+b.user_id,
+'1' AS source_type
+FROM
+teacher_open_course_merge_resources_question b
+LEFT JOIN  teacher_open_course_merge_course_info ba ON ba.teacher_open_course_merge_course_info_id = b.teacher_open_course_merge_course_info_id
+LEFT JOIN teacher_open_course_merge_course_info bb ON  bb.teacher_open_course_merge_course_info_id = ba.course_info_parent_id
+LEFT JOIN core_org bc ON bc.ID = b.org_id
+WHERE
+b.question_status != 0
+)
+) tt
+WHERE
+1 = 1
+@ // 课程ID
+@if(!isEmpty(courseInfoId_0)){
+AND tt.course_info_parent_id = #courseInfoId_0#  
+@}
+@ // 开课题目配置ID
+@if(!isEmpty(courseInfoId_1)){
+AND tt.course_info_id = #courseInfoId_1#  
+@}
+@if(!isEmpty(addTypeText)){
+and tt.add_type_text like #'%'+addTypeText+'%'#
+@}
+@if(!isEmpty(questionStem)){
+and tt.question_stem like #'%'+questionStem+'%'#
+@}
+order by tt.add_time desc