优化学生报告

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportStudentService.java

@@ -84,34 +84,15 @@ public class EReportStudentService {
         List<Map> list = eRstudentMapper.getStudentScoreByExamid(examid, studentid);
         Map rtnmap = new LinkedHashMap();
 
-        Integer classid = null;
         if (list != null && list.size() > 0) {
             Map map1 = list.get(0);
-            classid = Integer.parseInt(map1.get("classid").toString());
+            Integer classid = Integer.parseInt(map1.get("classid").toString());
 
-        }else{
-            //获取学生关联班级id
-            classid = eClassStudentMapper.getClassidByStudentidAndExamid(examid,studentid);
-            Map smap = eRstudentMapper.getStudentScoreByExamidForNo(examid,classid);
-            if(smap != null){
-                smap.put("score",0);
-                smap.put("bzscore",0);
-                smap.put("classrank",0);
-                smap.put("classrankpre",0);
-                smap.put("schoolrank",0);
-                smap.put("goal",0);
-                smap.put("nextgoal",0);
-                smap.remove("rsid");
-                smap.remove("studentid");
-
-                list = new ArrayList<>();
-                list.add(smap);
-            }
+            Map gcnum = eRstudentMapper.getStudentNumByExamid(examid, classid);
+            rtnmap.put("classnum", gcnum.get("classnum").toString());
+            rtnmap.put("gradenum", gcnum.get("gradenum").toString());
         }
         rtnmap.put("subjects", list);
-        Map gcnum = eRstudentMapper.getStudentNumByExamid(examid, classid);
-        rtnmap.put("classnum", gcnum.get("classnum").toString());
-        rtnmap.put("gradenum", gcnum.get("gradenum").toString());
         return rtnmap;
     }
 

sexam/src/main/resources/mapper/report/ERstudentMapper.xml

@@ -97,6 +97,7 @@
         <result property="gradesrate" column="gradesrate" />
         <result property="qscore" column="score" />
         <result property="epid" column="epid" />
+        <result property="qn" column="qn" />
         <result property="studentid" column="studentid" />
         <collection property="ques" ofType="java.util.Map" javaType="java.util.List"
                     column="{studentid=studentid,epid=epid,questionid=questionid}" select="listSubjectQuestionsStuScore">
@@ -107,7 +108,7 @@
     </resultMap>
     <select id="listSubjectQuestionsForTk" resultMap="listSubjectQuesTk">
         select cq.questionid,cq.classscore,cq.classsrate,cq.gradescore,cq.gradesrate,cq.qtypename,cq.score,
-        cq.epid,ps.studentid from e_rclass_question cq
+        cq.epid,cq.qn,ps.studentid from e_rclass_question cq
         left join e_paper_student ps on cq.epid=ps.epid and cq.classid=ps.classid
         where  cq.epid=#{epid} and ps.studentid=#{studentid} order by cq.qorder
     </select>

sexam/src/test/java/com/xhkjedu/sexam/SexamApplicationTests.java

@@ -1,30 +1,14 @@
 package com.xhkjedu.sexam;
 
-import com.xhkjedu.sexam.model.paper.EPaper;
-import com.xhkjedu.sexam.service.paper.EPaperQtypeService;
-import com.xhkjedu.sexam.service.report.EReportGenerateService;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import javax.annotation.Resource;
 
 @SpringBootTest
 class SexamApplicationTests {
 
-    @Resource
-    private EReportGenerateService eReportGenerateService;
-    @Resource
-    private EPaperQtypeService ePaperQtypeService;
-
     @Test
     void contextLoads() {
-        eReportGenerateService.saveClassQuestions(2);
-//        EPaper epaper = new EPaper();
-//        epaper.setEpid(6);
-//        epaper.setPnum(12);
-//        epaper.setPscore(100.0);
-//        ePaperQtypeService.savePaperAnalyzeForQuestion(epaper);
-
     }
 
 }