小么熊🐻 4 жил өмнө
parent
commit
7700ae07d2

+ 18 - 10
zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java

@@ -1,20 +1,28 @@
 package com.miaxis.app.controller.question;
 
+import com.miaxis.common.constant.Constants;
+import java.util.List;
+import java.util.Arrays;
+import io.swagger.annotations.*;
+import com.miaxis.common.core.domain.Response;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import com.miaxis.common.annotation.Log;
 import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
-import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.question.domain.QuestionInfo;
 import com.miaxis.question.service.IQuestionInfoService;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.common.core.page.ResponsePageInfo;
 
 /**
  * 【题库】Controller

+ 6 - 45
zzjs-service/src/main/java/com/miaxis/question/domain/QuestionInfo.java

@@ -1,16 +1,12 @@
 package com.miaxis.question.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.annotation.Excel;
 import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 /**
  * 题库对象 question_info
@@ -121,9 +117,9 @@ public class QuestionInfo extends BaseBusinessEntity{
 
     /** 1 */
     @Excel(name = "1")
-    @TableField("explain")
+    @TableField("explain1")
     @ApiModelProperty(value = "1")
-    private byte[] explain;
+    private byte[] explain1;
 
     /** 1 */
     @Excel(name = "1")
@@ -204,39 +200,4 @@ public class QuestionInfo extends BaseBusinessEntity{
     private Long m;
 
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("questionId", getQuestionId())
-            .append("mediaType", getMediaType())
-            .append("chapterId", getChapterId())
-            .append("label", getLabel())
-            .append("question", getQuestion())
-            .append("mediaKey", getMediaKey())
-            .append("answer", getAnswer())
-            .append("optionA", getOptionA())
-            .append("optionB", getOptionB())
-            .append("optionC", getOptionC())
-            .append("optionD", getOptionD())
-            .append("optionE", getOptionE())
-            .append("optionF", getOptionF())
-            .append("optionG", getOptionG())
-            .append("optionH", getOptionH())
-            .append("explain", getExplain())
-            .append("conciseExplain", getConciseExplain())
-            .append("keywords", getKeywords())
-            .append("assuredKeywords", getAssuredKeywords())
-            .append("illiteracyExplain", getIlliteracyExplain())
-            .append("illiteracyKeywords", getIlliteracyKeywords())
-            .append("difficulty", getDifficulty())
-            .append("wrongRate", getWrongRate())
-            .append("optionType", getOptionType())
-            .append("knackKeyword", getKnackKeyword())
-            .append("knackImgUrl", getKnackImgUrl())
-            .append("knackDetail", getKnackDetail())
-            .append("knackVoiceTxt", getKnackVoiceTxt())
-            .append("m", getM())
-            .toString();
-    }
 }

+ 4 - 3
zzjs-service/src/main/resources/mapper/question/QuestionInfoMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="optionF"    column="option_f"    />
         <result property="optionG"    column="option_g"    />
         <result property="optionH"    column="option_h"    />
-        <result property="explain"    column="explain"    />
+        <result property="explain1"    column="explain1"    />
         <result property="conciseExplain"    column="concise_explain"    />
         <result property="keywords"    column="keywords"    />
         <result property="assuredKeywords"    column="assured_keywords"    />
@@ -38,12 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQuestionInfoVo">
-        select id, question_id, media_type, chapter_id, label, question, media_key, answer, option_a, option_b, option_c, option_d, option_e, option_f, option_g, option_h, explain, concise_explain, keywords, assured_keywords, illiteracy_explain, illiteracy_keywords, difficulty, wrong_rate, option_type, knack_keyword, knack_img_url, knack_detail, knack_voice_txt, m, from question_info
+        select id, question_id, media_type, chapter_id, label, question, media_key, answer, option_a, option_b, option_c, option_d, option_e, option_f, option_g, option_h, explain1, concise_explain, keywords, assured_keywords, illiteracy_explain, illiteracy_keywords, difficulty, wrong_rate, option_type, knack_keyword, knack_img_url, knack_detail, knack_voice_txt, m from question_info
     </sql>
 
     <select id="selectQuestionInfoList" parameterType="QuestionInfo" resultMap="QuestionInfoResult">
         <include refid="selectQuestionInfoVo"/>
         <where>
+            <if test="id != null "> and id = #{id}</if>
             <if test="questionId != null "> and question_id = #{questionId}</if>
             <if test="mediaType != null "> and media_type = #{mediaType}</if>
             <if test="chapterId != null "> and chapter_id = #{chapterId}</if>
@@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="optionF != null  and optionF != ''"> and option_f = #{optionF}</if>
             <if test="optionG != null  and optionG != ''"> and option_g = #{optionG}</if>
             <if test="optionH != null  and optionH != ''"> and option_h = #{optionH}</if>
-            <if test="explain != null "> and explain = #{explain}</if>
+            <if test="explain1 != null "> and explain1 = #{explain1}</if>
             <if test="conciseExplain != null "> and concise_explain = #{conciseExplain}</if>
             <if test="keywords != null "> and keywords = #{keywords}</if>
             <if test="assuredKeywords != null "> and assured_keywords = #{assuredKeywords}</if>