Merge remote-tracking branch 'origin/master'

src/main/java/com/exam/mapper/AnswerMapper.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.*;
 
 @Mapper
 public interface AnswerMapper {
-    @Select("<script> select questionid,question,answerA,answerB,answerC,answerD,rightAnswer,analysis,subject,score,section,level,oneOrMore,\"选择题\" AS type,\"multi_question\" AS tablename from multi_question " +
+    @Select("<script> select questionid,question,answerA,answerB,answerC,answerD,rightAnswer,analysis,subject,score,section,level,oneOrMore,\"单选题\" AS type,\"multi_question\" AS tablename from multi_question " +
             "<if test='question != \"null\"'>" +
             "where question like concat('%',#{question},'%')"
             + "</if>" +
@@ -26,7 +26,7 @@ public interface AnswerMapper {
     int deletePaperManage(@Param("questionid") String questionid,@Param("questionType") String questionType,@Param("subject") String subject);
 
 
-    @Update("update multi_question set question = #{question},answerA = #{answerA},answerB = #{answerB},answerC = #{answerC},answerD = #{answerD},rightAnswer = #{rightAnswer},analysis = #{analysis} where questionid = #{questionid}")
+    @Update("update multi_question set question = #{question},answerA = #{answerA},answerB = #{answerB},answerC = #{answerC},answerD = #{answerD},rightAnswer = #{rightAnswer},analysis = #{analysis},section=#{section},level =#{level},oneOrMore= #{oneOrMore} where questionid = #{questionid}")
     int updateMultiQuestionByQuestionid(AnswerVO answerVO);
 
     @Update("update judge_question set question = #{question},answer = #{rightAnswer},analysis = #{analysis} where questionid = #{questionid}")