smart-steward-api/src/main/java/com/smartSteward/web/controller/common/CommonController.java

@@ -95,6 +95,7 @@ public class CommonController
             map.put("fileName", fileName);
             map.put("newFileName", FileUtils.getName(fileName));
             map.put("originalFilename", file.getOriginalFilename());
+            map.put("url", minioUtil.getFileUrl(fileName));
             ajax.put("data", map);
             return ajax;
         }

smart-steward-api/src/main/java/com/smartSteward/web/controller/exam/ExamQuestionCategoryController.java

@@ -42,7 +42,7 @@ public class ExamQuestionCategoryController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(ExamQuestionCategory examQuestionCategory)
     {
-        startPage();
+//        startPage();
         List<ExamQuestionCategory> list = examQuestionCategoryService.selectExamQuestionCategoryList(examQuestionCategory);
         return getDataTable(list);
     }

smart-steward-api/src/main/java/com/smartSteward/web/controller/exam/ExamQuestionController.java

@@ -46,6 +46,7 @@ public class ExamQuestionController extends BaseController
     {
         startPage();
         List<ExamQuestion> list = examQuestionService.selectExamQuestionList(examQuestion);
+
         return getDataTable(list);
     }
 

smart-steward-api/src/main/java/com/smartSteward/web/controller/knowledge/KnowledgeContentController.java

@@ -117,9 +117,9 @@ public class KnowledgeContentController extends BaseController
         }
 
         KnowledgeContent oldKnowledgeContent = knowledgeContentService.selectKnowledgeContentById(knowledgeContent.getId());
-        if (oldKnowledgeContent == null) {
-            return AjaxResult.error("内容不存在");
-        }
+//        if (oldKnowledgeContent == null) {
+//            return AjaxResult.error("内容不存在");
+//        }
 
 
         boolean isAdmin = knowledgeCategoryService.isAdmin(oldKnowledgeContent.getCategoryId(), getLoginUser());

smart-steward-api/src/main/resources/application.yml

@@ -53,7 +53,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: dev
-    #active: local
+#    active: local
     #active: production
   # 文件上传
   servlet:

smart-steward-entity/src/main/java/com/smartSteward/entity/database/exam/ExamQuestion.java

@@ -32,6 +32,11 @@ public class ExamQuestion extends BaseEntity
    @NotNull(message = "所属题库分类ID不能为空")
    private Long categoryId;
 
+   /** 题库分类名称 */
+   @Excel(name = "题库分类名称")
+   @ApiModelProperty("题库分类名称")
+   private String categoryName;
+
    /** 试题类型（如：single_choice-单选题、multiple_choice-多选题、judgment-判断题、essay-简答题、fill_blank-填空题） */
    @Excel(name = "试题类型", readConverterExp = "如=：single_choice-单选题、multiple_choice-多选题、judgment-判断题、essay-简答题、fill_blank-填空题")
    @ApiModelProperty("试题类型")
@@ -72,7 +77,7 @@ public class ExamQuestion extends BaseEntity
    private String questionStatus;
 
    /** 难度等级（easy-简单、medium-中等、hard-困难） */
-   @Excel(name = "难度等级", readConverterExp = "e=asy-简单、medium-中等、hard-困难")
+   @Excel(name = "难度等级", readConverterExp = "easy-简单、medium-中等、hard-困难")
    @ApiModelProperty("难度等级")
    private String difficultyLevel;
 

smart-steward-mapper/src/main/resources/mapper/exam/ExamQuestionMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="ExamQuestion" id="ExamQuestionResult">
         <result property="id"    column="id"    />
         <result property="categoryId"    column="category_id"    />
+        <result property="categoryName"    column="category_name"    />
         <result property="questionType"    column="question_type"    />
         <result property="questionContent"    column="question_content"    />
         <result property="options"    column="options"    />
@@ -28,7 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectExamQuestionList" parameterType="ExamQuestion" resultMap="ExamQuestionResult">
-        <include refid="selectExamQuestionVo"/>
+        select eq.*, eqc.name as category_name from exam_question as eq
+        left join exam_question_category as eqc on eq.category_id = eqc.id
         <where>
             <if test="categoryId != null "> and category_id = #{categoryId}</if>
             <if test="questionType != null  and questionType != ''"> and question_type = #{questionType}</if>