教师app作业报告

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperTeaAppController.java

@@ -13,6 +13,7 @@ import com.xhkjedu.vo.ResultVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
 import com.xhkjedu.sstudy.vo.paper.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +29,7 @@ import java.util.Map;
  * @description 
  * @date 2020/10/12 15:08
  **/
+@Slf4j
 @RestController
 @RequestMapping("/paper_teacher")
 public class PaperTeaAppController {
@@ -84,14 +86,19 @@ public class PaperTeaAppController {
         return new ResultVo(0,"获取已提交学生列表成功",list);
     }
 
-    //
+    //学生报告中-学生答题卡
     @PostMapping("/student_scantron")
     public ResultVo studentScantron(@RequestBody PStudentVo paper) {
-        Integer psid = paper.getPsid();
-        Integer papertype = paper.getPapertype();
-        N_Utils.validation(new Object[]{psid,"作业学生id",1,papertype,"作业类型",1});
-        PStudentVo scantron = paperTeaAppService.getStudentScantron(paper);
-        return new ResultVo(0,"获取学生答题卡成功",scantron);
+        try {
+            Integer psid = paper.getPsid();
+            Integer papertype = paper.getPapertype();
+            N_Utils.validation(new Object[]{psid,"作业学生id",1,papertype,"作业类型",1});
+            Map map = paperTeaAppService.getStudentScantron(paper);
+            return new ResultVo(0,"获取学生答题卡成功",map);
+        }catch (Exception e){
+            log.error("获取学生答题卡出错："+e.getMessage());
+            return new ResultVo(1,"获取学生答题卡失败");
+        }
     }
 
     @PostMapping("/student_question")

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperTeaAppMapper.java

@@ -3,12 +3,13 @@ package com.xhkjedu.sstudy.mapper.paper;
 import com.xhkjedu.sstudy.base.TkMapper;
 import com.xhkjedu.sstudy.model.paper.TPaper;
 import com.xhkjedu.sstudy.model.question.TQuestionClass;
+import com.xhkjedu.sstudy.vo.paper.*;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
-import com.xhkjedu.sstudy.vo.paper.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author ywx
@@ -69,7 +70,7 @@ public interface PaperTeaAppMapper extends TkMapper<TPaper> {
      * @Date 2020/10/14 16:05
      * @return com.xhkjedu.vo.teacherapp.PStudentVo
      **/
-    PStudentVo getStudentScantron(@Param("paper") PStudentVo paper);
+    Map getStudentScantron(@Param("paper") PStudentVo paper);
 
     /**
      * 学生答题卡单题详情

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

@@ -144,8 +144,40 @@ public class PaperTeaAppService {
      * @Date 2020/10/14 16:04
      * @return com.xhkjedu.vo.teacherapp.PStudentVo
      **/
-    public PStudentVo getStudentScantron(PStudentVo paper) {
-        return paperTeaAppMapper.getStudentScantron(paper);
+    public Map getStudentScantron(PStudentVo paper){
+        Map map = paperTeaAppMapper.getStudentScantron(paper);
+        Integer papertype = Integer.parseInt(map.get("papertype").toString());
+        if(papertype == 1){
+            List<Map> questions = (List<Map>) map.get("questions");
+            List<String> qids = new ArrayList<>();
+            List<Map> rtnques = new ArrayList<>();
+            for(Map q : questions){
+                Integer qlevel = Integer.parseInt(q.get("qlevel").toString());
+                if(qlevel == 1){
+                    q.remove("questionpid");
+                    q.remove("ctype");
+                    q.remove("qscore");
+                    q.remove("stuscore");
+                    rtnques.add(q);
+                }else{
+                    String questionpid = q.get("questionpid").toString();
+                    if(!qids.contains(questionpid)){
+                        qids.add(questionpid);
+                        List<Map> sonqmap = questions.stream().filter(s -> qlevel.equals(Integer.parseInt(s.get("qlevel").toString())) && questionpid.equals(s.get("questionpid").toString())).collect(Collectors.toList());
+                        Double stuscore = sonqmap.stream().mapToDouble(s -> Double.parseDouble(s.get("stuscore").toString())).sum();
+                        Double qscore = sonqmap.stream().mapToDouble(s -> Double.parseDouble(s.get("qscore").toString())).sum();
+                        Double correctrate = N_Utils.getDoubleDivideAndMulitiply(stuscore,qscore);
+                        Map mqmap = new TreeMap();
+                        mqmap.put("qorder",sonqmap.get(0).get("qorder"));
+                        mqmap.put("correctrate",correctrate);
+                        mqmap.put("questionid",questionpid);
+                        rtnques.add(mqmap);
+                    }
+                }
+            }
+            map.put("questions",rtnques);
+        }
+        return map;
     }
 
     /**

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

@@ -107,7 +107,7 @@
         order by ps.pschecked,ps.userscore ${paper.fieldorder},convert(u.username using gbk)
     </select>
     <!--获取学生答题卡-->
-    <resultMap id="scantronResult" type="com.xhkjedu.sstudy.vo.paper.PStudentVo">
+    <resultMap id="scantronResult" type="java.util.Map">
         <result property="papername" column="papername"></result>
         <result property="papernum" column="papernum"></result>
         <result property="scorerate" column="scorerate"></result>
@@ -118,18 +118,25 @@
         <result property="rank" column="rank"></result>
         <result property="paperscore" column="paperscore"></result>
         <result property="userscore" column="userscore"></result>
-        <collection property="questions" ofType="com.xhkjedu.sstudy.vo.paper.PaperTeacherReportVo">
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
             <result property="qorder" column="qorder"></result>
             <result property="qn" column="qn"></result>
             <result property="correctrate" column="correctrate"></result>
-            <result property="ctype" column="ctype"></result>
+            <result property="stuscore" column="stuscore"></result>
+            <result property="qscore" column="qscore"></result>
+            <result property="qlevel" column="qlevel"></result>
+            <result property="questionid" column="questionid"></result>
+            <result property="questionpid" column="questionpid"></result>
         </collection>
     </resultMap>
     <select id="getStudentScantron" resultMap="scantronResult">
         select p.papername,ps.papernum,truncate(ps.userscore*100/ps.paperscore,2)scorerate,#{paper.papertype} papertype
-        ,ps.psid,ps.stoptime,ps.costtime,q.qorder,q.qn,truncate(q.stuscore*100/q.qscore,2)correctrate,tq.ctype
+        ,ps.psid,ps.stoptime,ps.costtime,q.qorder,q.qn,truncate(q.stuscore*100/q.qscore,2)correctrate,q.stuscore,q.qscore
         ,(select count(*)+1 from t_paper_student ps1
         where ps1.paperid=ps.paperid and ps1.userscore>ps.userscore)rank,ps.paperscore,ps.userscore
+        <if test="paper.papertype==1 or paper.papertype==3">
+            ,tq.qlevel,tq.questionid,tq.questionpid
+        </if>
         from t_paper_student ps left join t_paper p on ps.paperid = p.paperid
         <if test="paper.papertype==1 or paper.papertype==3">
             left join t_paper_student_question q on ps.psid=q.psid