Merge remote-tracking branch 'origin/master' into ywx

sstudy/src/main/java/com/xhkjedu/sstudy/model/paperstudent/TPaperStudentQuestion.java

@@ -65,6 +65,9 @@ public class TPaperStudentQuestion extends BaseBean {
     //学校id
     private Integer schoolid;
 
+    //答案类型1选择题、图片2纯文本
+    private Integer answertype;
+
     //学生答案
     private String useranswer;
 

sstudy/src/main/java/com/xhkjedu/sstudy/model/paperstudent/TPaperStudentScantron.java

@@ -65,6 +65,9 @@ public class TPaperStudentScantron extends BaseBean {
     //学校id
     private Integer schoolid;
 
+    //答案类型1选择题、图片2纯文本
+    private Integer answertype;
+
     //学生答案
     private String useranswer;
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/PaperStudentQuestionVo.java

@@ -66,6 +66,9 @@ public class PaperStudentQuestionVo {
     //试题序号
     private Integer qorder;
 
+    //答案类型1选择题、图片2纯文本
+    private Integer answertype;
+
     //学生答案
     private String useranswer;
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/PaperStudentScantronVo.java

@@ -49,6 +49,9 @@ public class PaperStudentScantronVo {
     //试题分值
     private Double qscore;
 
+    //答案类型1选择题、图片2纯文本
+    private Integer answertype;
+
     //学生答案
     private String useranswer;
 

sstudy/src/main/resources/mapper/paper/PaperAnalyzeMapper.xml

@@ -176,6 +176,7 @@
             <result property="answered" column="answered"></result>
             <result property="answertime" column="answertime"></result>
             <result property="costtime" column="costtime"></result>
+            <result property="answertype" column="answertype"></result>
             <result property="useranswer" column="useranswer"></result>
             <result property="converted" column="converted"></result>
             <result property="useranswertext" column="useranswertext"></result>
@@ -223,6 +224,7 @@
             <result property="pscaid" column="pscaid"></result>
             <result property="qorder" column="qorder"></result>
             <result property="answered" column="answered"></result>
+            <result property="answertype" column="answertype"></result>
             <result property="useranswer" column="useranswer"></result>
             <result property="converted" column="converted"></result>
             <result property="useranswertext" column="useranswertext"></result>
@@ -244,7 +246,7 @@
     <!--答题卡作业统计 按人详情 题型列表-->
     <select id="listPeopleSDetailAnalyze" resultMap="typeSQuestion">
         SELECT psq.qtypename,psq.pstorder ptorder,psq.pstscore ptscore,psq.pstnum ptnum,
-        pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qorder,pss.answered,pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,
+        pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qorder,pss.answered,pss.answertype,pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,
         pss.answertime,pss.costtime,pss.checked,pss.stuscore,pss.qscore,pss.pscaid,pss.device,pss.checkcomm,
         psc.qtypeid,psc.ctype,psc.psanswer,psc.optionnum
         FROM t_paper_student_scantron pss LEFT JOIN t_paper_scantron psc ON pss.pscaid = psc.pscaid

sstudy/src/main/resources/mapper/paperstudent/PaperStudedntScantronMapper.xml

@@ -4,7 +4,8 @@
 
     <!-- 获取学生答题卡信息 -->
     <select id="listPaperStudentScantrons" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentScantronVo">
-        SELECT pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qorder,pss.answered,pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,pss.device,
+        SELECT pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qorder,pss.answered,pss.answertype,
+               pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,pss.device,
         pss.answertime,pss.costtime,pss.checked,pss.stuscore,pss.qscore,pss.pscaid,pss.checkcomm,
         psc.qtypeid,psc.qtypename,psc.ctype,psc.psanswer,psc.optionnum,u.username studentname
         FROM t_paper_student_scantron pss LEFT JOIN t_user u ON pss.studentid=u.userid
@@ -14,7 +15,7 @@
 
     <!-- 获取学生答题卡待批改试题列表- -->
     <select id="sListCorrectQuestion" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentScantronVo">
-        SELECT pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qorder,pss.answered,pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,
+        SELECT pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qorder,pss.answered,pss.useranswer,pss.answertype,pss.converted,pss.useranswertext,pss.useranswertxt,
         pss.answertime,pss.costtime,pss.checked,pss.stuscore,pss.qscore,pss.pscaid,pss.device,pss.checkcomm,
         psc.qtypeid,psc.qtypename,psc.ctype,psc.psanswer,u.username studentname
         FROM t_paper_student_scantron pss LEFT JOIN t_user u ON pss.studentid=u.userid

sstudy/src/main/resources/mapper/paperstudent/PaperStudentQuestionMapper.xml

@@ -4,7 +4,7 @@
     <!--获取学生作业详情-->
     <select id="getPaperQuestion" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
         SELECT psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.device,psq.checkcomm
-        ,psq.useranswer,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,u.username studentname,psq.psid
+        ,psq.useranswer,psq.answertype,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,u.username studentname,psq.psid
         ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypename,q.hashear,q.hearfile
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         ,(CASE WHEN q.ctype IN(16,17) THEN JSON_LENGTH(q.qoption) ELSE 0 END)qoptioncount
@@ -19,7 +19,7 @@
     <!--获取学生待批改试题列表-->
     <select id="listCorrectQuestion" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
         SELECT psq.psqid,psq.paperid,psq.studentid,psq.answered,psq.answertime,psq.costtime,psq.device,psq.checkcomm
-        ,psq.useranswer,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,u.username studentname,psq.psid
+        ,psq.useranswer,psq.answertype,psq.converted,psq.useranswertext,psq.useranswertxt,psq.checked,psq.qscore,psq.stuscore,psq.qorder,u.username studentname,psq.psid
         ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.qtypeid,q.qtypename
         ,(CASE WHEN psq.checked=1 AND psq.stuscore=psq.qscore THEN 1 ELSE 2 END)corrected
         ,(CASE WHEN q.ctype IN(7,8) THEN JSON_LENGTH(q.qoption) ELSE 0 END)qoptioncount
@@ -84,6 +84,7 @@
             <result property="psid" column="psid"></result>
             <result property="psqid" column="psqid"></result>
             <result property="device" column="device"></result>
+            <result property="answertype" column="answertype"></result>
             <result property="useranswer" column="useranswer"></result>
             <result property="converted" column="converted"></result>
             <result property="useranswertext" column="useranswertext"></result>
@@ -95,7 +96,7 @@
     <select id="qcorrectList" resultMap="questionResult">
         select psq.qscore,psq.qorder,q.qstem,q.qoption,q.qanswer,q.qanalyze
         ,psq.stuscore,psq.answered,psq.checked,psq.checkcomm,psq.psid,psq.psqid
-        ,psq.device,psq.useranswer,psq.converted,psq.useranswertext,psq.useranswertxt,u.username,ps.psstate
+        ,psq.device,psq.useranswer,psq.converted,psq.answertype,psq.useranswertext,psq.useranswertxt,u.username,ps.psstate
         from t_paper_student_question psq left join t_question q on psq.questionid = q.questionid
         left join t_user u on psq.studentid = u.userid
         left join t_paper_student ps on psq.psid=ps.psid