完善学生试卷信息

src/main/java/com/xhkjedu/mapper/EPaperVerifyMapper.java

@@ -1,5 +1,6 @@
 package com.xhkjedu.mapper;
 
+import com.xhkjedu.model.EPaperQtypeQuestion;
 import com.xhkjedu.model.EPaperStudent0608;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,4 +22,7 @@ public interface EPaperVerifyMapper {
 
     //识别正确跳过
     void correctSkip(@Param("epsid") Integer epsid);
+
+    //获取试卷原试题答案
+    List<EPaperQtypeQuestion> listPaperAnswer(@Param("epid") Integer epid);
 }

src/main/java/com/xhkjedu/model/EPaperQtypeQuestion.java

@@ -0,0 +1,60 @@
+package com.xhkjedu.model;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "e_paper_qtype_question")
+@Data
+public class EPaperQtypeQuestion extends BaseBean {
+    @Id
+    //考试试卷题型试题表
+    private Integer eptqid;
+
+    //考试试卷题型表id
+    private Integer eptid;
+
+    //考试试卷表id
+    private Integer epid;
+
+    //处理题型
+    private Integer ctype;
+
+    //试题id
+    private String questionid;
+
+    //题型id
+    private String qtypeid;
+
+    //题型名称
+    private String qtypename;
+
+    //试题分值
+    private Double score;
+
+    //试题排序
+    private Integer qorder;
+
+    //题号
+    private String qn;
+
+    //选项数量
+    private Integer optionnum;
+
+    //正确答案
+    private String answer;
+
+    //坐标
+    private String coord;
+
+    //作文格数
+    private Integer gnum;
+
+    //答题区高度
+    private Integer height;
+
+    //答题区富文本
+    private String queshtml;
+
+}

src/main/java/com/xhkjedu/service/EPaperVerifyService.java

@@ -33,4 +33,11 @@ public class EPaperVerifyService {
     public void correctSkip(Integer epsid) {
         ePaperVerifyMapper.correctSkip(epsid);
     }
+
+    public void correctSave(){
+
+    }
+
+
 }
+

src/main/java/com/xhkjedu/vo/PaperStudentParams.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.vo;
+
+import com.xhkjedu.model.EPaperStudentQuestion;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author WN
+ * Date 2022/7/28 17:15
+ **/
+@Data
+public class PaperStudentParams {
+
+    private Integer epid;//试卷id
+
+    private Integer studentid;//学生id
+
+    //试卷学生id
+    private Integer epsid;
+
+    //学生答题卡图片
+    private String stupic;
+
+    private String examno;//学生准考证号
+
+    //试卷中试题
+    private List<EPaperStudentQuestion> questions;
+}

src/main/resources/EPaperVerifyMapper.xml

@@ -12,20 +12,33 @@
 
     <!--获取学生试卷及试题作答-->
     <resultMap id="stuPaper" type="java.util.Map">
-        <result column="epsid" property="epsid"></result>
-        <result column="stupic" property="stupic"></result>
+        <result column="epsid" property="epsid" />
+        <result column="epid" property="epid" />
+        <result column="stupic" property="stupic" />
+        <result column="studentid" property="studentid" />
+        <result column="username" property="username" />
+        <result column="examno" property="examno" />
+        <result column="classid" property="classid" />
+        <result column="classname" property="classname" />
+        <result column="gradeid" property="gradeid" />
         <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
-            <result column="qtypename" property="qtypename"></result>
-            <result column="epsqid" property="epsqid"></result>
-            <result column="qn" property="qn"></result>
-            <result column="ctype" property="ctype"></result>
-            <result column="stuanswer" property="stuanswer"></result>
+            <result column="qtypename" property="qtypename" />
+            <result column="epsqid" property="epsqid" />
+            <result column="epsqid" property="epsqid" />
+            <result column="eptqid" property="eptqid" />
+            <result column="qn" property="qn" />
+            <result column="ctype" property="ctype" />
+            <result column="answered" property="answered" />
+            <result column="answertype" property="answertype" />
+            <result column="stuanswer" property="stuanswer" />
         </collection>
     </resultMap>
     <select id="getStudentPaper" resultMap="stuPaper">
-        SELECT ps.epsid,ps.stupic,pt.qtypename,psq.epsqid,psq.qn,psq.ctype,psq.stuanswer
-        FROM e_paper_student0608 ps LEFT JOIN e_paper_student_question0608 psq ON ps.epsid=psq.epsid and psq.ctype in(1,2,4,5,6,7,8,10,16,17)
+        SELECT ps.epsid,ps.epid,ps.stupic,ps.studentid,u.username,u.examno,ps.classid,c.classname,pt.qtypename,psq.epsqid,psq.eptqid,psq.qn,psq.ctype,psq.stuanswer
+        FROM e_paper_student0608 ps LEFT JOIN e_paper_student_question0608 psq ON ps.epsid=psq.epsid
         left JOIN e_paper_qtype_question pt ON psq.eptqid=pt.eptid
+        left join t_user u on ps.studentid=u.userid
+        left join t_class c on ps.classid=c.classid
         WHERE ps.examid=#{ps.examid} AND ps.subjectid=#{ps.subjectid} AND ps.studentid=#{ps.studentid} and ps.verified=#{ps.verified}
     </select>
     <!--识别正确跳过-->
@@ -33,4 +46,10 @@
         UPDATE e_paper_student0608 ps LEFT JOIN e_paper_student ps2 ON ps.epsid=ps2.epsid
         SET ps.verified=1,ps2.verified=1 WHERE ps.epsid=#{epsid}
     </update>
+
+    <!--获取原试卷中试题正确答案-->
+    <select id="listPaperAnswer" resultType="com.xhkjedu.model.EPaperQtypeQuestion">
+        select eptqid,eptid,epid,ctype,questionid,qtypeid,qtypename,qn,score,qorder,answer
+        from e_paper_qtype_question where epid=#{epid} order by qorder
+    </select>
 </mapper>