附件作业添加qn题号

sstudy/src/main/java/com/xhkjedu/sstudy/model/paper/TPaperScantron.java

@@ -30,9 +30,12 @@ public class TPaperScantron extends BaseBean {
     //处理题型
     private Integer ctype;
 
-    //题号
+    //试题排序
     private Integer psorder;
 
+    //题号
+    private String qn;
+
     //分值
     private Double psscore;
 

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

@@ -32,6 +32,9 @@ public class TPaperStudentScantron extends BaseBean {
     //作业学生id
     private Integer psid;
 
+    //题号
+    private String qn;
+
     //排序
     private Integer qorder;
 

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/ZQuestionUpdateService.java

@@ -95,6 +95,7 @@ public class ZQuestionUpdateService {
                 q.setSnum(optionlist.size());
                 q.setSorder(0);
                 q.setQstate(1);
+                q.setHashear(0);
                 q.setSource(qvo.getSource());
                 q.setYear(qvo.getYear());
                 q.setRegion(qvo.getRegion());
@@ -164,6 +165,7 @@ public class ZQuestionUpdateService {
                     sq.setSnum(0);
                     sq.setSorder(i+1);
                     sq.setQstate(1);
+                    sq.setHashear(0);
                     sq.setSource(qvo.getSource());
                     sq.setYear(qvo.getYear());
                     sq.setRegion(qvo.getRegion());

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/ScantronVo.java

@@ -22,9 +22,12 @@ public class ScantronVo {
     //处理题型
     private Integer ctype;
 
-    //题号
+    //试题排序
     private Integer psorder;
 
+    //题号
+    private String qn;
+
     //分值
     private Double psscore;
 

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

@@ -28,6 +28,9 @@ public class PaperStudentScantronVo {
     //作业学生id
     private Integer psid;
 
+    //题号
+    private String qn;
+
     //排序
     private Integer qorder;
 

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

@@ -232,6 +232,7 @@
             <result property="studentid" column="studentid"></result>
             <result property="psid" column="psid"></result>
             <result property="pscaid" column="pscaid"></result>
+            <result property="qn" column="qn"></result>
             <result property="qorder" column="qorder"></result>
             <result property="answered" column="answered"></result>
             <result property="answertype" column="answertype"></result>
@@ -256,7 +257,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.answertype,pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,
+        pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qn,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.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/paper/PaperScantronQtypeMapper.xml

@@ -19,6 +19,7 @@
             <result property="qtypename" column="qtypename"></result>
             <result property="ctype" column="ctype"></result>
             <result property="psorder" column="psorder"></result>
+            <result property="qn" column="qn"></result>
             <result property="psscore" column="psscore"></result>
             <result property="psanswer" column="psanswer"></result>
             <result property="optionnum" column="optionnum"></result>
@@ -28,7 +29,7 @@
     <!-- 获取题型以及题型下试题 -->
     <select id="listQtypeScans" resultMap="qtypeSacn">
         SELECT psq.psqtypeid,psq.qtypeid,psq.qtypename,psq.pstorder,psq.pstscore,psq.pstnum,ps.pscaid,
-        ps.qtypeid,ps.qtypename,ps.ctype,ps.psorder,ps.psscore,ps.psanswer,ps.optionnum
+        ps.qtypeid,ps.qtypename,ps.ctype,ps.psorder,ps.qn,ps.psscore,ps.psanswer,ps.optionnum
         FROM t_paper_scantron_qtype psq LEFT JOIN t_paper_scantron ps ON psq.psqtypeid=ps.psqtypeid
         WHERE psq.paperid=#{paperid} ORDER BY psq.pstorder,ps.psorder
     </select>
@@ -46,6 +47,7 @@
             <result property="qtypename" column="qtypename"></result>
             <result property="ctype" column="ctype"></result>
             <result property="psorder" column="psorder"></result>
+            <result property="qn" column="qn"></result>
             <result property="psscore" column="psscore"></result>
             <result property="psanswer" column="psanswer"></result>
             <result property="optionnum" column="optionnum"></result>
@@ -55,7 +57,7 @@
     <!-- 获取题型以及题型下试题用于处理分析 -->
     <select id="listQtypeScansForAnalyze" resultMap="qtypeSacnForAna">
         SELECT psq.psqtypeid,psq.qtypeid,psq.qtypename,psq.pstorder,psq.pstscore,psq.pstnum,ps.pscaid,
-               ps.qtypeid,ps.qtypename,ps.ctype,ps.psorder,ps.psscore,ps.psanswer,ps.optionnum
+               ps.qtypeid,ps.qtypename,ps.ctype,ps.psorder,ps.pn,ps.psscore,ps.psanswer,ps.optionnum
         FROM t_paper_scantron_qtype psq LEFT JOIN t_paper_scantron ps ON psq.psqtypeid=ps.psqtypeid
         WHERE psq.paperid=#{paperid} ORDER BY psq.pstorder,ps.psorder
     </select>

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

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