答题卡作业

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -121,6 +121,7 @@ public class PaperService {
             paper.setPapernum(scanlist.size());
             Double paperscore = scanlist.stream().collect(Collectors.summingDouble(TPaperScantron::getPsscore));
             paper.setPaperscore(paperscore);
+            paper.setPapertype(2);
 
             //修改作业基本信息
             paperMapper.updatePaper(paper);
@@ -142,8 +143,6 @@ public class PaperService {
 
                 rtn = true;
             }
-
-
         }catch (Exception e){
             log.error("修改答题卡作业失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -427,6 +426,7 @@ public class PaperService {
         ps.setDirectorid(paper.getDirectorid());
         ps.setDirectorname(paper.getDirectorname());
         ps.setShowtype(paper.getShowtype());
+        ps.setHearfile(paper.getHearfile());
 
         List<TPaperFile> fils = paperFileService.listObjsByPaperid(paperid);
         ps.setPfiles(fils);

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

@@ -157,6 +157,7 @@ public class QuestionService {
                 sq.setQstate(1);
                 sq.setBelong(question.getBelong());
                 sq.setHashear(0);
+                sq.setSnum(0);
                 sq.setSubjectid(question.getSubjectid());
                 sq.setCreateid(question.getCreateid());
                 sq.setCreatetime(timestamp);

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

@@ -13,6 +13,7 @@ import java.util.List;
  **/
 @Data
 public class PaperScantronQtypeVo {
+    private Integer psqtypeid;
     //试题题型id
     private String qtypeid;
 

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

@@ -54,4 +54,6 @@ public class PaperScantronVo {
     //答案显示方式：1作业截至时间，2提交后显示
     private Integer showtype;
 
+    private String hearfile;//听力材料地址
+
 }

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

@@ -46,4 +46,6 @@ public class PaperVo {
 
     //作业状态：21未布置 22 已布置
     private Integer paperstate;
+
+    private String hearfile;//听力文件
 }

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

@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public class ScantronVo {
     //答题卡表
-    private Integer psid;
+    private Integer pscaid;
 
     //试题题型id
     private String qtypeid;

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

@@ -44,7 +44,7 @@
     <!--详情-->
     <select id="findById" resultType="com.xhkjedu.sstudy.vo.paper.PaperVo">
         select p.paperid,p.papername,p.papernum,p.paperscore,p.createtime,u.username createname,
-        p.papertype,p.comm,p.paperclass,p.directorid,p.paperstate
+        p.papertype,p.comm,p.paperclass,p.directorid,p.paperstate,p.hearfile
         ,(select showtype from t_paper_group pg where pg.paperid=p.paperid limit 1)showtype
         from t_paper p left join t_user u on u.userid=p.createid
         where p.paperid=#{paperid} limit 1

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

@@ -7,14 +7,14 @@
     </delete>
 
     <resultMap id="qtypeSacn" type="com.xhkjedu.sstudy.vo.paper.PaperScantronQtypeVo">
+        <result property="psqtypeid" column="psqtypeid"></result>
         <result property="qtypeid" column="qtypeid"></result>
         <result property="qtypename" column="qtypename"></result>
         <result property="pstorder" column="pstorder"></result>
         <result property="pstscore" column="pstscore"></result>
         <result property="pstnum" column="pstnum"></result>
-        <result property="ctype" column="ctype"></result>
-        <collection property="scantrons" ofType="com.xhkjedu.sstudy.vo.paper.ScantronVo">
-            <result property="psid" column="psid"></result>
+        <collection property="scantrons" ofType="com.xhkjedu.sstudy.vo.paper.ScantronVo" javaType="java.util.List">
+            <result property="pscaid" column="pscaid"></result>
             <result property="qtypeid" column="qtypeid"></result>
             <result property="qtypename" column="qtypename"></result>
             <result property="ctype" column="ctype"></result>
@@ -27,7 +27,7 @@
 
     <!-- 获取题型以及题型下试题 -->
     <select id="listQtypeScans" resultMap="qtypeSacn">
-        SELECT psq.qtypeid,psq.qtypename,psq.pstorder,psq.pstscore,psq.pstnum,
+        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
         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