分析添加题型id(方便查询)

sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclassQtype.java

@@ -28,6 +28,9 @@ public class ERclassQtype extends BaseBean {
     //题型名称
     private String qtypename;
 
+    //题型id
+    private String qtypeid;
+
     //题型下试题分值
     private Double score;
 

sexam/src/main/java/com/xhkjedu/sexam/model/reportstu/ERStudentQtype.java

@@ -36,6 +36,9 @@ public class ERStudentQtype extends BaseBean {
     //题型名称
     private String qtypename;
 
+    //题型id
+    private String qtypeid;
+
     //学生得分
     private Double stuscore;
 

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

@@ -294,6 +294,7 @@ public class EPaperQtypeService {
             double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
             Map tmap = new HashMap();
             tmap.put("qtname",qt.getEptname());
+            tmap.put("qtid",qt.getEptid());
             tmap.put("num",qt.getEptnum());
             tmap.put("score",qt.getEptscore());
             tmap.put("srate",storerate);
@@ -613,7 +614,6 @@ public class EPaperQtypeService {
 
             for(EPaperQtype t : aq){
                 List<EPaperQtypeQuestion> qlist = t.getQuestions();
-
                 for(EPaperQtypeQuestion q : qlist){
                     orderlist.add(q.getQorder());
                     eptqidlist.add(q.getId());
@@ -628,6 +628,7 @@ public class EPaperQtypeService {
 
             Map tmap = new HashMap();
             tmap.put("qtname",entry.getKey());
+            tmap.put("qtid",aq.get(0).getEptid());
             tmap.put("num",num);
             tmap.put("score",tscore);
             tmap.put("srate",storerate);

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

@@ -1178,6 +1178,7 @@ public class EReportGenerateService {
         for (int k = 0; k < qtypelist.size(); k++) {
             Map qtypemap = qtypelist.get(k);
             String qtypename = qtypemap.get("qtypename").toString();
+            String qtypeid = qtypemap.get("qtid").toString();
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
             Integer num = Integer.parseInt(qtypemap.get("num").toString());//题型下试题数量
@@ -1277,6 +1278,7 @@ public class EReportGenerateService {
                 eRclassQtype.setEpid(examPaperClassVo.getEpid());
                 eRclassQtype.setClassid(entry.getKey());
                 eRclassQtype.setQtypename(qtypename);
+                eRclassQtype.setQtypeid(qtypeid);
                 eRclassQtype.setScore(score);
                 eRclassQtype.setNum(num);
                 eRclassQtype.setSrate(srate);
@@ -1297,6 +1299,7 @@ public class EReportGenerateService {
                 erStudentQtype.setSubjectid(examPaperClassVo.getSubjectid());
                 erStudentQtype.setEpid(examPaperClassVo.getEpid());
                 erStudentQtype.setQtypename(qtypename);
+                erStudentQtype.setQtypeid(qtypeid);
                 erStudentQtype.setStusrate(N_Utils.getDoubleDivideAndMulitiply(erStudentQtype.getStuscore(), score));
                 stutypelist.add(erStudentQtype);
             }
@@ -1310,6 +1313,7 @@ public class EReportGenerateService {
         for (int k = 0; k < qtypelist.size(); k++) {
             Map qtypemap = qtypelist.get(k);
             String qtypename = qtypemap.get("qtypename").toString();
+            String qtypeid = qtypemap.get("qtid").toString();
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
             Integer num = Integer.parseInt(qtypemap.get("num").toString());//题型下试题数量
@@ -1461,6 +1465,7 @@ public class EReportGenerateService {
                 eRclassQtype.setEpid(examPaperClassVo.getEpid());
                 eRclassQtype.setClassid(entry.getKey());
                 eRclassQtype.setQtypename(qtypename);
+                eRclassQtype.setQtypeid(qtypeid);
                 eRclassQtype.setScore(score);
                 eRclassQtype.setNum(num);
                 eRclassQtype.setSrate(srate);
@@ -1481,6 +1486,7 @@ public class EReportGenerateService {
                 erStudentQtype.setSubjectid(examPaperClassVo.getSubjectid());
                 erStudentQtype.setEpid(examPaperClassVo.getEpid());
                 erStudentQtype.setQtypename(qtypename);
+                erStudentQtype.setQtypeid(qtypeid);
                 erStudentQtype.setStusrate(N_Utils.getDoubleDivideAndMulitiply(erStudentQtype.getStuscore(), score));
                 stutypelist.add(erStudentQtype);
             }

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

@@ -70,7 +70,7 @@
     <select id="listSubjectQtypes" resultType="java.util.Map">
         select st.qtypename,st.stuscore,st.stusrate,ct.score,ct.srate,ct.gradescore,ct.gradesrate,ct.classscore,ct.classsrate,ct.qns
         from e_rstudent_qtype st left join e_rclass_qtype ct on st.examid=ct.examid
-            and st.subjectid=ct.subjectid and st.qtypename=ct.qtypename
+            and st.subjectid=ct.subjectid and st.qtypeid=ct.qtypeid
         where st.examid=#{examid} and st.subjectid=#{subjectid} and st.studentid=#{studentid}
     </select>
     <!--学生报告-学科分析-试题分析-->