修改学生试卷分值时列表

sexam/src/main/java/com/xhkjedu/sexam/controller/paper/EPaperQtypeController.java

@@ -68,10 +68,6 @@ public class EPaperQtypeController {
     @PostMapping("/answer")
     public ResultVo setPaperQuestionAnswer(@RequestBody EPaper paper){
         N_Utils.validation(new Object[]{paper.getEpid(),"试卷id",1});
-        List<EPaperQtypeQuestion> ques = paper.getQuestions();//试题
-        if(ques == null || ques.size() ==0){
-            return new ResultVo(1,"未设置试题");
-        }
         ePaperQtypeService.saveQuesitonAnswer(paper);
         return new ResultVo(0,"设置成功");
     }

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

@@ -150,4 +150,17 @@ public class EPaperStudentController {
         }
     }
 
+    //学生试卷作答及得分
+    @PostMapping("/spscore")
+    public ResultVo getStudentPaperScore(@RequestBody EPaperStudent ps) {
+        try {
+            N_Utils.validation(new Object[]{ps.getStudentid(),"学生id",1,ps.getEpid(),"试卷id",1});
+            Map map = ePaperStudentService.getStudentPaperScore(ps.getStudentid(),ps.getEpid());
+            return new ResultVo(0, "成功获取学生试卷作答及得分",map);
+        } catch (Exception e) {
+            log.error("获取学生试卷作答及得分失败：" + e.getMessage());
+            return new ResultVo(1, "获取学生试卷作答及得分失败");
+        }
+    }
+
 }

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

@@ -28,7 +28,7 @@ public class EScanbatchController {
     //保持批次信息
     @PostMapping("/save")
     public ResultVo saveEscanbatch(@RequestBody EScanbatch eScanbatch) {
-        N_Utils.validation(new Object[]{eScanbatch.getEpid(),"试卷id",1,eScanbatch.getMac(),"设备",2});
+        N_Utils.validation(new Object[]{eScanbatch.getEpid(),"试卷id",1,eScanbatch.getDevice(),"设备",2});
         Map map = eScanbatchService.saveScanBatch(eScanbatch);
         return new ResultVo(0, "成功保存", map);
     }

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

@@ -60,4 +60,7 @@ public interface EPaperStudentMapper extends TkMapper<EPaperStudent> {
 
     //更改单个学生试卷分值
     void updateStuPaperscoreEpsid(@Param("epsid")Integer epsid);
+
+    //获取学生试卷基础信息和得分
+    Map getStudentPaperScore(@Param("studentid") Integer studentid,@Param("epid") Integer epid);
 }

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

@@ -9,6 +9,7 @@ import org.springframework.jmx.export.annotation.ManagedOperationParameter;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 学生试卷试题
@@ -57,4 +58,10 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
     //根据试题id获取考试信息
     EPaperStudentQuestion getExamPaperStudntQuestionbyEpsqid(@Param("epsqid")Integer epsqid);
 
+    //学生作答得分试卷-题库
+    List<Map> listQStuQuestionScore(@Param("epsid")Integer epsid);
+
+    //学生作答得分试卷-附件
+    List<Map> listFjStuQuestionScore(@Param("epsid")Integer epsid);
+
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description: 扫描答题卡批次表
@@ -45,7 +46,8 @@ public class EScanbatch extends BaseBean {
     private Integer createtime;
 
     //扫描仪mac地址
-    private String mac;
+    @Transient
+    private String device;
 
 
 }

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

@@ -490,12 +490,16 @@ public class EPaperQtypeService {
     @Transactional(rollbackFor = Exception.class)
     public void saveQuesitonAnswer(EPaper ePaper){
         List<EPaperQtypeQuestion> questions = ePaper.getQuestions();
-        ePaperQtypeMapper.updateBatchQuestionAnswer(questions);
-        ePaper.setAnswered(1);
-        ePaperMapper.updateEPaperAnswered(ePaper);
-        //设置完答案进行匹配
+        if(questions != null && questions.size() > 0){
+            ePaperQtypeMapper.updateBatchQuestionAnswer(questions);
+            ePaper.setAnswered(1);
+            ePaperMapper.updateEPaperAnswered(ePaper);
+            //设置完答案进行匹配
+            setChangeQuestionAnswer(questions,ePaper.getEpid());
+        }
     }
 
+    //对于已经开始考试的试卷修改正确答案重新判断试题
     private void setChangeQuestionAnswer(List<EPaperQtypeQuestion> questions,Integer epid){
         //获取考试对应的状态,如果考试状态未进行中或者已结束，则需要更改学生已提交试卷中对应试题的答案
         Map map = ePaperMapper.getExamPaperAndSubject(epid);
@@ -527,9 +531,7 @@ public class EPaperQtypeService {
                         for(EPaperStudentQuestion cq : cqlist){
                             Double stuscore = 0D;
                             List<String> stuanswers = JSON.parseArray(cq.getStuanswer(),String.class);
-                            if(N_Utils.isListEmpty(stuanswers)){
-                                break;
-                            }else{
+                            if(N_Utils.isListNotEmpty(stuanswers)){
                                 if(q.getCtype() == 1 || q.getCtype() == 4 || q.getCtype() == 5 || q.getCtype() == 6){
                                     if(q.getAnswer().equalsIgnoreCase(cq.getStuanswer())){
                                         stuscore = q.getScore();

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

@@ -26,8 +26,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 学生试卷信息
@@ -537,4 +539,50 @@ public class EPaperStudentService {
         eScanbatchMapper.updateErrornum(eScanerror.getBatchid());
     }
 
+    /**
+     * @Description 学生试卷作答得分
+     * @Param [studentid, epid]
+     * @Return java.util.Map
+     * @Author wn
+     * @Date 2022/8/12 10:45
+     **/
+    public Map getStudentPaperScore(Integer studentid,Integer epid){
+        Map paper = ePaperStudentMapper.getStudentPaperScore(studentid,epid);
+        Integer ptype = Integer.parseInt(paper.get("ptype").toString());
+        Integer epsid = Integer.parseInt(paper.get("epsid").toString());
+        List<Map> qtypeques = null;
+        if(ptype == 1){
+            qtypeques = ePaperStudentQuestionMapper.listQStuQuestionScore(epsid);
+        }else{
+            qtypeques = ePaperStudentQuestionMapper.listFjStuQuestionScore(epsid);
+        }
+        paper.put("qtypes",qtypeques);
+        return paper;
+    }
+
+    private void setQuestionsForPaper(List<Map> qtypes){
+        for(Map mt : qtypes){
+            Integer ctype = Integer.parseInt(mt.get("ctype").toString());
+            if(ctype == 11 || ctype == 12){
+                List<Map> questions = (List<Map>) mt.get("questions");
+                Map<String,List<Map>> quemap = questions.stream().collect(Collectors.groupingBy(o -> o.get("questionpid").toString()));
+                List<Map> mqlist = new ArrayList<>();
+                for(Map.Entry<String,List<Map>> entry : quemap.entrySet()){
+                    List<Map> sonqlst = entry.getValue();
+                    Double sontotalsocre = sonqlst.stream().mapToDouble(o -> Double.parseDouble(o.get("score").toString())).sum();
+                    Map sque = sonqlst.get(0);
+                    Map mque = new HashMap();
+                    mque.put("questionid",sque.get("mquestionid").toString());
+                    mque.put("qstem",sque.get("mqstem").toString());
+                    mque.put("ctype",Integer.parseInt(sque.get("mctype").toString()));
+                    mque.put("qtypeid",sque.get("mqtypeid").toString());
+                    mque.put("qtypename",sque.get("mqtypename").toString());
+                    mque.put("qn",sque.get("qn").toString());
+
+                }
+
+            }
+        }
+    }
+
 }

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

@@ -40,7 +40,7 @@ public class EScanbatchService {
      * @date: 2022/8/11/011 9:42
      **/
     public Map saveScanBatch(EScanbatch eScanbatch){
-        String batchname = eScanbatch.getMac() + "-" + eScanbatch.getEpid() + "-";
+        String batchname = eScanbatch.getDevice() + "-" + eScanbatch.getEpid() + "-";
         //获取数据库中该批次名的扫描批次数量
         Integer bnum = eScanbatchMapper.getBatchNameLikeNum(batchname);
         if(bnum == null || bnum == 0){

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

@@ -98,6 +98,7 @@
             <result column="qtypename" property="qtypename"></result>
             <result column="qctype" property="ctype"></result>
             <result column="qstem" property="qstem"></result>
+            <result column="hearfile" property="hearfile"></result>
             <result column="qoption" property="qoption"></result>
             <result column="qanswer" property="qanswer"></result>
             <result column="qanalyze" property="qanalyze"></result>
@@ -110,6 +111,7 @@
             <result column="mqtypeid" property="mqtypeid"></result>
             <result column="mqtypename" property="mqtypename"></result>
             <result column="mctype" property="mctype"></result>
+            <result column="mhearfile" property="mhearfile"></result>
         </collection>
     </resultMap>
     <!--试题详情-->
@@ -119,7 +121,7 @@
                psq.epsqid,psq.questionid,psq.qorder,psq.qn,psq.qscore,psq.answered,psq.answertype,psq.stuanswer,
                psq.stuanswertxt,psq.eptqid,q.qstem,q.qoption,q.ctype qctype,q.hearfile,q.qtypeid,
                q.qtypename,q.qlevel,q.snum,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,
-               mq.qoption mqoption,mq.ctype mctype,mq.qtypeid mqtypeid,mq.qtypename mqtypename
+               mq.qoption mqoption,mq.ctype mctype,mq.qtypeid mqtypeid,mq.qtypename mqtypename,mq.hearfile mhearfile
         from e_paper_student_question psq left join e_paper_qtype_question ptq on psq.eptqid=ptq.eptqid
         left join e_paper_qtype pt on pt.eptid=ptq.eptid
         left join t_question q on psq.questionid=q.questionid
@@ -197,4 +199,17 @@
         update e_paper_student ps set ps.stuscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM e_paper_student_question q
           WHERE q.epsid=#{epsid} ) where ps.epsid=#{epsid}
     </update>
+
+    <!--获取学生试卷基础信息和得分-->
+    <select id="getStudentPaperScore" resultType="java.util.Map">
+        SELECT ps.epsid,ps.epid,ps.studentid,u.username stuname,u.loginname,ps.stuscore,s.subjectid,s.subjectname,
+        e.examname,e.gradeid,c.classname,p.ptype,p.hearfile
+        from e_paper_student ps left join e_subject s on ps.esid=s.esid
+        left join e_paper p on ps.epid = p.epid
+        left join e_base e on ps.examid=e.examid
+        left join t_user u on ps.studentid=u.userid
+        left join e_class_student cs on cs.studentid=ps.studentid
+        left join e_class c on cs.classid=c.classid
+        where ps.studentid=#{studentid} and ps.epid=#{epid} group by ps.studentid
+    </select>
 </mapper>

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

@@ -147,4 +147,89 @@
         where q.epsqid=#{epsqid}
     </select>
 
+    <!--学生作答试卷题库-->
+    <resultMap id="qtypesQuestion" type="java.util.Map">
+        <result column="ctype" property="ctype"></result>
+        <result column="eptname" property="eptname"></result>
+        <result column="eptnum" property="eptnum"></result>
+        <result column="eptorder" property="eptorder"></result>
+        <result column="eptscore" property="eptscore"></result>
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
+            <result column="epsqid" property="epsqid"></result>
+            <result column="questionid" property="questionid"></result>
+            <result column="score" property="score"></result>
+            <result column="qorder" property="qorder"></result>
+            <result column="qn" property="qn"></result>
+            <result column="answer" property="answer"></result>
+            <result column="stuanswer" property="stuanswer"></result>
+            <result column="stuscore" property="stuscore"></result>
+            <result column="answered" property="answered"></result>
+            <result column="answertype" property="answertype"></result>
+            <result column="stuanswer" property="stuanswer"></result>
+            <result column="stuanswertxt" property="stuanswertxt"></result>
+            <result column="eptqid" property="eptqid"></result>
+            <result column="qtypeid" property="qtypeid"></result>
+            <result column="qtypename" property="qtypename"></result>
+            <result column="qctype" property="ctype"></result>
+            <result column="qstem" property="qstem"></result>
+            <result column="hearfile" property="hearfile"></result>
+            <result column="qoption" property="qoption"></result>
+            <result column="qlevel" property="qlevel"></result>
+            <result column="sorder" property="sorder"></result>
+            <result column="snum" property="snum"></result>
+            <result column="questionpid" property="questionpid"></result>
+            <result column="mquestionid" property="mquestionid"></result>
+            <result column="mqstem" property="mqstem"></result>
+            <result column="mqtypeid" property="mqtypeid"></result>
+            <result column="mqtypename" property="mqtypename"></result>
+            <result column="mctype" property="mctype"></result>
+            <result column="mhearfile" property="mhearfile"></result>
+        </collection>
+    </resultMap>
+    <select id="listQStuQuestionScore" resultMap="qtypesQuestion">
+        select pt.ctype,pt.eptname,pt.eptnum,pt.eptorder,pt.eptscore,
+               psq.epsqid,psq.questionid,psq.qorder,psq.qn,ptq.score,ptq.answer,psq.answered,psq.answertype,psq.stuanswer,
+               psq.stuanswertxt,psq.eptqid,psq.stuscore,q.qstem,q.qoption,q.ctype qctype,q.hearfile,q.qtypeid,
+               q.qtypename,q.qlevel,q.snum,q.sorder,q.questionpid,mq.questionid mquestionid,mq.qstem mqstem,
+               mq.qoption mqoption,mq.ctype mctype,mq.qtypeid mqtypeid,mq.qtypename mqtypename,mq.hearfile mhearfile
+        from e_paper_student_question psq left join e_paper_qtype_question ptq on psq.eptqid=ptq.eptqid
+        left join e_paper_qtype pt on pt.eptid=ptq.eptid
+        left join t_question q on psq.questionid=q.questionid
+        left join t_question mq on q.questionpid=mq.questionid
+        where psq.epsid=#{epsid} order by pt.eptorder,psq.qorder
+    </select>
+
+
+    <!--学生作答得分试卷附件-->
+    <resultMap id="fjtypeQuestions" type="java.util.Map">
+        <result column="ctype" property="ctype"></result>
+        <result column="eptname" property="eptname"></result>
+        <result column="eptnum" property="eptnum"></result>
+        <result column="eptorder" property="eptorder"></result>
+        <result column="eptscore" property="eptscore"></result>
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.Map">
+            <result column="epsqid" property="epsqid"></result>
+            <result column="score" property="score"></result>
+            <result column="qorder" property="qorder"></result>
+            <result column="qn" property="qn"></result>
+            <result column="eptqid" property="eptqid"></result>
+            <result column="qtypename" property="qtypename"></result>
+            <result column="qctype" property="ctype"></result>
+            <result column="optionnum" property="optionnum"></result>
+            <result column="answer" property="answer"></result>
+            <result column="stuscore" property="stuscore"></result>
+            <result column="answered" property="answered"></result>
+            <result column="answertype" property="answertype"></result>
+            <result column="stuanswer" property="stuanswer"></result>
+            <result column="stuanswertxt" property="stuanswertxt"></result>
+        </collection>
+    </resultMap>
+    <select id="listFjStuQuestionScore" resultMap="fjtypeQuestions">
+        select pt.ctype,pt.eptname,pt.eptnum,pt.eptorder,pt.eptscore,psq.epsqid,psq.qn,psq.qorder,psq.answered,psq.answertype,
+        psq.stuanswer,psq.stuanswertxt,psq.eptqid,psq.qscore score,psq.stuscore,pq.answer,pq.optionnum,pq.ctype qctype,pq.qtypename
+        from e_paper_student_question psq left join e_paper_qtype_question pq on psq.eptqid=pq.eptqid
+        left join e_paper_qtype pt on pq.eptid=pt.eptid
+        where psq.epsid=#{epsid} order by pt.eptorder, psq.qorder
+    </select>
+
 </mapper>