保存扫码答题卡内容

sexam/src/main/java/com/xhkjedu/sexam/controller/paperstudent/EPaperStudentController.java

@@ -123,15 +123,22 @@ public class EPaperStudentController {
         }
     }
 
+    /**
+     * @Description 保存扫描的答题卡
+     * @Param [ps]
+     * @Return com.xhkjedu.vo.ResultVo
+     * @Author wn
+     * @Date 2022/8/3 14:35
+     **/
     @PostMapping("/sca")
     public ResultVo saveCommitPaperScantron(@RequestBody PaperStudentWebVo ps) {
         try {
-            N_Utils.validation(new Object[]{ps.getEpid(), "试卷id", 1});
+            N_Utils.validation(new Object[]{ps.getEpid(), "试卷id", 1,ps.getExamno(),"考号",2});
             ePaperStudentService.saveCommitPaperForScantron(ps);
-            return new ResultVo(0, "成功提交试卷");
+            return new ResultVo(0, "成功保存学生答题卡");
         } catch (Exception e) {
-            log.error("提交试卷(web)失败：" + e.getMessage());
-            return new ResultVo(1, "提交失败");
+            log.error("保存学生答题卡失败：" + e.getMessage());
+            return new ResultVo(1, "保存学生答题卡失败");
         }
     }
 

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentMapper.java

@@ -51,4 +51,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
     //根据试卷id批量修改该试卷学生得分
     void updateBathStudentPaperScoreByEpid(@Param("epid")Integer epid);
+
+    //根据试卷id和学生id获取学生试卷信息
+    EPaperStudent getPaperStudentByStuidAndEpid(@Param("epid")Integer epid,@Param("studentid")Integer studentid);
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentQuestionMapper.java

@@ -44,4 +44,9 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
 
     //批量修改学生试题分值
     void updateBatchStuQuestionScore(@Param("list")List<EPaperStudentQuestion> list);
+
+    //修改缺考学生试卷试题批阅状态
+    void updateStuQuestionChecked(@Param("epsid")Integer epsid,@Param("studentid")Integer studentid);
+
+
 }

sexam/src/main/java/com/xhkjedu/sexam/mapper/system/UserMapper.java

@@ -21,4 +21,7 @@ public interface UserMapper {
 
     //主监考人快捷查找
     List<Map> listQuickMasterTeacher(@Param("usernames") String[] usernames, @Param("schoolid") Integer schoolid);
+
+    //根据准考证号获取学生id
+    Integer getUseridByExamno(@Param("examno")String examno);
 }

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPaperStudent.java

@@ -58,6 +58,9 @@ public class EPaperStudent extends BaseBean {
     //学生答题卡作答图片
     private String stupic;
 
+    //会否违规0未违规1违规
+    private Integer hasbad;
+
     //创建时间
     private Integer createtime;
 }

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

@@ -195,6 +195,7 @@ public class EBaseService {
                 es.setStuscore(0.0);
                 es.setCosttime(0);
                 es.setCreatetime(timestamp);
+                es.setHasbad(0);
                 studentList.add(es);
             }
         }

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

@@ -604,6 +604,15 @@ public class EPaperQtypeService {
                     }
                 }
             }
+
+            //设置答题卡需要默认值
+            if(eps.get("scantronnote") == null){
+                String scantronnote = "1.答题前，考生先将自己的姓名、班级、考场填写清楚，并认真核对条形码上的姓名和准考证号。\n" +
+                        "2.选择题部分请按题号用2B铅笔填涂方框，修改时用橡皮擦干净，不留痕迹。\n" +
+                        "3.非选择题部分请按题号用0.5毫米黑色墨水签字笔书写，否则作答无效。要求字体工整、笔迹清晰。作图时，必须使用2B铅笔，并描浓\n" +
+                        "4.在草稿纸、试题卷上答题无效。";
+                eps.put("scantronnote",scantronnote);
+            }
         }
 
         Map rtnmap = new HashMap();

sexam/src/main/java/com/xhkjedu/sexam/service/paperstudent/EPaperStudentService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.xhkjedu.sexam.mapper.paper.EPaperQtypeMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentMapper;
 import com.xhkjedu.sexam.mapper.paperstudent.EPaperStudentQuestionMapper;
+import com.xhkjedu.sexam.mapper.system.UserMapper;
 import com.xhkjedu.sexam.model.paper.EPaperQtype;
 import com.xhkjedu.sexam.model.paper.EPaperQtypeQuestion;
 import com.xhkjedu.sexam.model.paperstudent.EPaperStudent;
@@ -38,6 +39,8 @@ public class EPaperStudentService {
     private EPaperQtypeMapper ePaperQtypeMapper;
     @Resource
     private EPaperStudentQuestionMapper ePaperStudentQuestionMapper;
+    @Resource
+    private UserMapper userMapper;
     @Autowired
     private ConvertUtil convertUtil;
 
@@ -186,7 +189,7 @@ public class EPaperStudentService {
         try {
             //学生作答提交时先判断试卷是否设置的正确答案
             PsqAnswerVo answerVo = ePaperStudentQuestionMapper.getPaperQuestionAnswer(psq.getEpsqid());
-            setCommitQuestion(psq,answerVo,1);
+            setCommitQuestion(psq,answerVo);
             ePaperStudentQuestionMapper.updateStuAnswer(psq);
         }catch (Exception e){
             log.error("提交试题失败："+e.getMessage());
@@ -195,8 +198,8 @@ public class EPaperStudentService {
 
     }
 
-    //判断但道题情况
-    private void setCommitQuestion(EPaperStudentQuestion psq,PsqAnswerVo answerVo,Integer type){
+    //判断单道题情况
+    private void setCommitQuestion(EPaperStudentQuestion psq,PsqAnswerVo answerVo){
         int timestamp = N_Utils.getSecondTimestamp();
         psq.setAnswertime(timestamp);
         int coverted = 1;//是否转换0未转换1已转换2转换失败
@@ -277,13 +280,8 @@ public class EPaperStudentService {
                         psq.setChecked(2);
                         psq.setChecktime(timestamp);
                     }else{
-
                         if(stuanswers.size() > 0){
                             coverted = 0;//上传的多张图片设为0未转换
-                            if(type == 2){
-                                //网页端提交试卷时直接合并多张图片试题
-                                convertUtil.imgMerge(psq.getEptqid(),stuanswers,1);
-                            }
                         }
                     }
                     psq.setAnswered(1);
@@ -326,12 +324,17 @@ public class EPaperStudentService {
         }
         paperStudent.setChecked(checked);
         ePaperStudentMapper.updateStudentPaper(paperStudent);//修改试卷信息
+        chandleStudentQuestionNoconvertedPic(epsid,1);//处理试卷中多张图片未合并情况
+    }
+
+    //处理试卷中未已提交需要合并的图片,type1代表线上2代表扫码答题卡图片
+    private void chandleStudentQuestionNoconvertedPic(Integer epsid,Integer type){
         List<EPaperStudentQuestion> psqlist = ePaperStudentQuestionMapper.listStuQuesitonStuAnswerPic(epsid);
         if(N_Utils.isListNotEmpty(psqlist)){
             for(EPaperStudentQuestion sq : psqlist){
                 List<String> stuanswer = JSON.parseArray(sq.getStuanswer(),String.class);
                 if(N_Utils.isListNotEmpty(stuanswer) && stuanswer.size()>1){
-                    convertUtil.imgMerge(sq.getEpsqid(),stuanswer,1);
+                    convertUtil.imgMerge(sq.getEpsqid(),stuanswer,type);
                 }
             }
         }
@@ -360,7 +363,7 @@ public class EPaperStudentService {
             //获取该试题正确答案
             PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getEptqid().equals(q.getEptqid())).findFirst().orElse(null);
 
-            setCommitQuestion(q,anvo,2);
+            setCommitQuestion(q,anvo);
             if(q.getChecked() == 2){
                 checknum ++;
             }
@@ -379,6 +382,9 @@ public class EPaperStudentService {
 
         ePaperStudentQuestionMapper.updateBatchStuQuestion(sqlist);
         ePaperStudentMapper.updateStudentPaper(paperStudent);
+
+        //获取试卷中需要合并图片的试题
+        chandleStudentQuestionNoconvertedPic(pswvo.getEpsid(),1);
     }
 
     /**
@@ -388,24 +394,35 @@ public class EPaperStudentService {
      * @Author wn
      * @Date 2022/8/3 9:17
      **/
-    public void saveCommitPaperForScantron(PaperStudentWebVo pswvo){
+    public void saveCommitPaperForScantron(PaperStudentWebVo pswvo) throws Exception{
         //更加学生姓名和准考证号找到对应学生
+        Integer userid = userMapper.getUseridByExamno(pswvo.getExamno());
+        if(!N_Utils.isTrueInteger(userid)){
+            throw new Exception("考号有误");
+        }
+        //获取学生试卷
+        EPaperStudent ps = ePaperStudentMapper.getPaperStudentByStuidAndEpid(pswvo.getEpid(),userid);
+        pswvo.setEpsid(ps.getEpsid());
 
-        int epsid = 0;
-        pswvo.setEpsid(epsid);
-        EPaperStudent ps = ePaperStudentMapper.selectByPrimaryKey(pswvo.getEpsid());
-        //试卷不存在或者已提交
-        if(ps == null || ps.getSstate() == 1){
-            return;
+        //试卷不存在
+        if(ps == null) {
+            throw new Exception("学生试卷不存在");
         }
 
         if(pswvo.getSstate() == 3){
-            //说明学生缺考仅更新状态和
+            //说明学生缺考更新状态
             EPaperStudent paperStudent = new EPaperStudent();
             paperStudent.setEpsid(pswvo.getEpsid());
             paperStudent.setStupic(JSON.toJSONString(pswvo.getStupic()));
             paperStudent.setSstate(3);
+            if(!N_Utils.isEmptyInteger(pswvo.getSstate())){
+                paperStudent.setHasbad(0);
+            }else{
+                paperStudent.setHasbad(1);
+            }
+
             ePaperStudentMapper.updateStudentPaperState(paperStudent);
+            ePaperStudentQuestionMapper.updateStuQuestionChecked(pswvo.getEpsid(),userid);
         }else{
             List<EPaperStudentQuestion> sqlist = pswvo.getQuestions();//学生提交试卷中试题
 
@@ -414,14 +431,16 @@ public class EPaperStudentService {
             Integer checknum = 0;//记录试卷中试题批阅数量
             Double paperscore = 0D;//学生试卷得分
             for(EPaperStudentQuestion q : sqlist){
+                q.setAnswertype(1);
 
-                //获取该试题正确答案
-                PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getEptqid().equals(q.getEptqid())).findFirst().orElse(null);
+                //获取该试题正确答案(根据题号区分)
+                PsqAnswerVo anvo = anvolist.stream().filter(a -> a.getQn().equals(q.getQn())).findFirst().orElse(null);
 
-                setCommitQuestion(q,anvo,2);
+                setCommitQuestion(q,anvo);
                 if(q.getChecked() == 2){
                     checknum ++;
                 }
+                q.setEpsqid(anvo.getEpsqid());
                 paperscore = ExamUtil.add(paperscore, q.getStuscore());
             }
             EPaperStudent paperStudent = new EPaperStudent();
@@ -437,6 +456,8 @@ public class EPaperStudentService {
 
             ePaperStudentQuestionMapper.updateBatchStuQuestion(sqlist);
             ePaperStudentMapper.updateStudentPaper(paperStudent);
+            //获取试卷中需要合并图片的试题
+            chandleStudentQuestionNoconvertedPic(pswvo.getEpsid(),2);
         }
     }
 

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/PaperStudentWebVo.java

@@ -26,10 +26,10 @@ public class PaperStudentWebVo {
 
     private Integer epid;//试卷id
 
-    private String stuname;//学生姓名
-
     private String examno;//学生准考证号
 
     private Integer sstate;//状态0未进场1已进场2已交卷3缺考
 
+    private Integer hasbad;//会否违规0未违规1违规
+
 }

sexam/src/main/java/com/xhkjedu/sexam/vo/paperstudent/PsqAnswerVo.java

@@ -9,6 +9,8 @@ import lombok.Data;
  **/
 @Data
 public class PsqAnswerVo {
+    private Integer epsqid;//学生试题id
+
     private Integer eptqid;//试卷中试题id
 
     private Integer ctype;//处理题型
@@ -17,7 +19,12 @@ public class PsqAnswerVo {
 
     private String answer;//答案
 
+    private String qn;//题号
+
+    private Integer qorder;//试题排序
+
     private Integer answered;//试卷是否设置正确答案1已设置0未设置
 
     private Integer costtime;//话费时间
+
 }

sexam/src/main/resources/mapper/paperstudent/EPaperStudentMapper.xml

@@ -169,6 +169,9 @@
     <!--更新缺考状态-->
     <update id="updateStudentPaperState">
         update e_paper_student set sstate=#{ps.sstate},checked=#{ps.checked},stupic=#{ps.stupic}
+        <if test="ps.ps.hasbad!=null and ps.hasbad!=0">
+            ,hasbad=#{ps.hasbad}
+        </if>
         where epsid=#{ps.epsid}
     </update>
 
@@ -177,4 +180,9 @@
         update e_paper_student ps set ps.stuscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM e_paper_student_question q
         WHERE q.epid=#{epid} and q.epsid=ps.epsid) where ps.epid=#{epid}
     </update>
+
+    <!--根据试卷id和学生id获取学生试卷信息-->
+    <select id="getPaperStudentByStuidAndEpid" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudent">
+        select * from e_paper_student where epid=#{epid} and studentid=#{studentid} order by epsid desc limit 1
+    </select>
 </mapper>

sexam/src/main/resources/mapper/paperstudent/EPaperStudentQuestionMapper.xml

@@ -30,13 +30,13 @@
 
     <!--获取试卷中未合并图片-->
     <select id="listStuQuesitonStuAnswerPic" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
-        select epsqid,stuanswer from e_paper_student_question
-        where epsid=#{epsid} and answertype=1 and converted=0
+        select epsqid,stuanswer,stupic from e_paper_student_question
+        where epsid=#{epsid} and answertype=1 and answered=1 and converted=0 order by qorder
     </select>
 
     <!--获取试卷中所有试题正确答案及分值-->
     <select id="listPaperQuestionsAnswer" resultType="com.xhkjedu.sexam.vo.paperstudent.PsqAnswerVo">
-        select distinct psq.eptqid,psq.costtime,ptq.ctype,ptq.score,ptq.answer,p.answered
+        select distinct psq.epsqid,psq.eptqid,psq.costtime,psq.qn,psq.qorder,ptq.ctype,ptq.score,ptq.answer,p.answered
         from e_paper_student_question psq left join e_paper_qtype_question ptq on psq.eptqid=ptq.eptqid
         left join e_paper p on psq.epid=p.epid where psq.epsid=#{epsid} order by ptq.qorder
     </select>
@@ -128,4 +128,11 @@
             </foreach>
         </where>
     </update>
+
+    <!--更新缺考学生试题均已批阅-->
+    <update id="updateStuQuestionChecked">
+        update e_paper_student_question set q.checked=2,checktime=unix_timestamp(NOW())
+        where epsid=#{epsid} and studentid=#{studentid}
+    </update>
+
 </mapper>

sexam/src/main/resources/mapper/system/UserMapper.xml

@@ -41,4 +41,9 @@
         </foreach>
         group by u.userid
     </select>
+
+    <!--根据准考证号获取学生id-->
+    <select id="getUseridByExamno" resultType="java.lang.Integer">
+        select userid from t_user where examno=#{examno}
+    </select>
 </mapper>