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

sexam/src/main/java/com/xhkjedu/sexam/model/paper/EPaper.java

@@ -49,6 +49,9 @@ public class EPaper extends BaseBean {
     //答题卡文件
     private String scantronfile;
 
+    //答题卡张数
+    private Integer scantronnum;
+
     private String scantronpdf;//答题卡pdf
 
     //答题卡注意事项

sexam/src/main/java/com/xhkjedu/sexam/service/exam/EBaseService.java

@@ -117,6 +117,10 @@ public class EBaseService {
             p.setPscore(0.0);
             p.setAnswered(0);
             p.setCorrecttype(0);
+            p.setScantronnum(0);
+            p.setScantronspace(0);
+            p.setScantroncol(0);
+            p.setCodenum(0);
             papers.add(p);
         }
         eSubjectMapper.insertList(subjects);//考试科目

sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java

@@ -687,6 +687,11 @@ public class EPaperQtypeService {
     @Transactional(rollbackFor = Exception.class)
     public void savePaperScan(EPaper paper){
         List<EPaperQtypeQuestion> questions = paper.getQuestions();
+        if(N_Utils.isNotEmpty(paper.getScantronfile())){
+            List<String> scanfiles = JSON.parseArray(paper.getScantronfile(),String.class);
+            int pn = scanfiles.size() / 2;//答题卡的张数
+            paper.setScantronnum(pn);
+        }
         ePaperMapper.updatePaperScantron(paper);
         ePaperQtypeMapper.updateBatchQuestionForScan(questions);
         if(paper.getPstate() == 1){

sexam/src/main/resources/mapper/paper/EPaperMapper.xml

@@ -90,7 +90,7 @@
 
     <!--修改设置答题卡-->
     <update id="updatePaperScantron">
-        update e_paper set scantronfile=#{paper.scantronfile},scantronnote=#{paper.scantronnote}
+        update e_paper set scantronfile=#{paper.scantronfile},scantronnote=#{paper.scantronnote},scantronnum=#{paper.scantronnum}
         ,scantronwh=#{paper.scantronwh},scantroncol=#{paper.scantroncol},cantronmiss=#{paper.cantronmiss},
         cantronbad=#{paper.cantronbad},codetype=#{paper.codetype},codenum=#{paper.codenum},
         cantroncode=#{paper.cantroncode},cantronpage=#{paper.cantronpage},cantronbarcode=#{paper.cantronbarcode},