Browse Source

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

tags/正式版本
王宁 2 years ago
parent
commit
9460236563

+ 3
- 0
sexam/src/main/java/com/xhkjedu/sexam/model/reportclass/ERclassQtype.java View File

28
     //题型名称
28
     //题型名称
29
     private String qtypename;
29
     private String qtypename;
30
 
30
 
31
+    //题型id
32
+    private String qtypeid;
33
+
31
     //题型下试题分值
34
     //题型下试题分值
32
     private Double score;
35
     private Double score;
33
 
36
 

+ 3
- 0
sexam/src/main/java/com/xhkjedu/sexam/model/reportstu/ERStudentQtype.java View File

36
     //题型名称
36
     //题型名称
37
     private String qtypename;
37
     private String qtypename;
38
 
38
 
39
+    //题型id
40
+    private String qtypeid;
41
+
39
     //学生得分
42
     //学生得分
40
     private Double stuscore;
43
     private Double stuscore;
41
 
44
 

+ 2
- 1
sexam/src/main/java/com/xhkjedu/sexam/service/paper/EPaperQtypeService.java View File

294
             double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
294
             double storerate = N_Utils.getDoubleDivideAndMulitiply(qt.getEptscore(), ePaper.getPscore());
295
             Map tmap = new HashMap();
295
             Map tmap = new HashMap();
296
             tmap.put("qtname",qt.getEptname());
296
             tmap.put("qtname",qt.getEptname());
297
+            tmap.put("qtid",qt.getEptid());
297
             tmap.put("num",qt.getEptnum());
298
             tmap.put("num",qt.getEptnum());
298
             tmap.put("score",qt.getEptscore());
299
             tmap.put("score",qt.getEptscore());
299
             tmap.put("srate",storerate);
300
             tmap.put("srate",storerate);
613
 
614
 
614
             for(EPaperQtype t : aq){
615
             for(EPaperQtype t : aq){
615
                 List<EPaperQtypeQuestion> qlist = t.getQuestions();
616
                 List<EPaperQtypeQuestion> qlist = t.getQuestions();
616
-
617
                 for(EPaperQtypeQuestion q : qlist){
617
                 for(EPaperQtypeQuestion q : qlist){
618
                     orderlist.add(q.getQorder());
618
                     orderlist.add(q.getQorder());
619
                     eptqidlist.add(q.getId());
619
                     eptqidlist.add(q.getId());
628
 
628
 
629
             Map tmap = new HashMap();
629
             Map tmap = new HashMap();
630
             tmap.put("qtname",entry.getKey());
630
             tmap.put("qtname",entry.getKey());
631
+            tmap.put("qtid",aq.get(0).getEptid());
631
             tmap.put("num",num);
632
             tmap.put("num",num);
632
             tmap.put("score",tscore);
633
             tmap.put("score",tscore);
633
             tmap.put("srate",storerate);
634
             tmap.put("srate",storerate);

+ 6
- 0
sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportGenerateService.java View File

1178
         for (int k = 0; k < qtypelist.size(); k++) {
1178
         for (int k = 0; k < qtypelist.size(); k++) {
1179
             Map qtypemap = qtypelist.get(k);
1179
             Map qtypemap = qtypelist.get(k);
1180
             String qtypename = qtypemap.get("qtypename").toString();
1180
             String qtypename = qtypemap.get("qtypename").toString();
1181
+            String qtypeid = qtypemap.get("qtid").toString();
1181
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
1182
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
1182
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
1183
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
1183
             Integer num = Integer.parseInt(qtypemap.get("num").toString());//题型下试题数量
1184
             Integer num = Integer.parseInt(qtypemap.get("num").toString());//题型下试题数量
1277
                 eRclassQtype.setEpid(examPaperClassVo.getEpid());
1278
                 eRclassQtype.setEpid(examPaperClassVo.getEpid());
1278
                 eRclassQtype.setClassid(entry.getKey());
1279
                 eRclassQtype.setClassid(entry.getKey());
1279
                 eRclassQtype.setQtypename(qtypename);
1280
                 eRclassQtype.setQtypename(qtypename);
1281
+                eRclassQtype.setQtypeid(qtypeid);
1280
                 eRclassQtype.setScore(score);
1282
                 eRclassQtype.setScore(score);
1281
                 eRclassQtype.setNum(num);
1283
                 eRclassQtype.setNum(num);
1282
                 eRclassQtype.setSrate(srate);
1284
                 eRclassQtype.setSrate(srate);
1297
                 erStudentQtype.setSubjectid(examPaperClassVo.getSubjectid());
1299
                 erStudentQtype.setSubjectid(examPaperClassVo.getSubjectid());
1298
                 erStudentQtype.setEpid(examPaperClassVo.getEpid());
1300
                 erStudentQtype.setEpid(examPaperClassVo.getEpid());
1299
                 erStudentQtype.setQtypename(qtypename);
1301
                 erStudentQtype.setQtypename(qtypename);
1302
+                erStudentQtype.setQtypeid(qtypeid);
1300
                 erStudentQtype.setStusrate(N_Utils.getDoubleDivideAndMulitiply(erStudentQtype.getStuscore(), score));
1303
                 erStudentQtype.setStusrate(N_Utils.getDoubleDivideAndMulitiply(erStudentQtype.getStuscore(), score));
1301
                 stutypelist.add(erStudentQtype);
1304
                 stutypelist.add(erStudentQtype);
1302
             }
1305
             }
1310
         for (int k = 0; k < qtypelist.size(); k++) {
1313
         for (int k = 0; k < qtypelist.size(); k++) {
1311
             Map qtypemap = qtypelist.get(k);
1314
             Map qtypemap = qtypelist.get(k);
1312
             String qtypename = qtypemap.get("qtypename").toString();
1315
             String qtypename = qtypemap.get("qtypename").toString();
1316
+            String qtypeid = qtypemap.get("qtid").toString();
1313
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
1317
             Double score = Double.parseDouble(qtypemap.get("score").toString());//题型下试题总分值
1314
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
1318
             Double srate = Double.parseDouble(qtypemap.get("srate").toString());//题型下试题分值占比
1315
             Integer num = Integer.parseInt(qtypemap.get("num").toString());//题型下试题数量
1319
             Integer num = Integer.parseInt(qtypemap.get("num").toString());//题型下试题数量
1461
                 eRclassQtype.setEpid(examPaperClassVo.getEpid());
1465
                 eRclassQtype.setEpid(examPaperClassVo.getEpid());
1462
                 eRclassQtype.setClassid(entry.getKey());
1466
                 eRclassQtype.setClassid(entry.getKey());
1463
                 eRclassQtype.setQtypename(qtypename);
1467
                 eRclassQtype.setQtypename(qtypename);
1468
+                eRclassQtype.setQtypeid(qtypeid);
1464
                 eRclassQtype.setScore(score);
1469
                 eRclassQtype.setScore(score);
1465
                 eRclassQtype.setNum(num);
1470
                 eRclassQtype.setNum(num);
1466
                 eRclassQtype.setSrate(srate);
1471
                 eRclassQtype.setSrate(srate);
1481
                 erStudentQtype.setSubjectid(examPaperClassVo.getSubjectid());
1486
                 erStudentQtype.setSubjectid(examPaperClassVo.getSubjectid());
1482
                 erStudentQtype.setEpid(examPaperClassVo.getEpid());
1487
                 erStudentQtype.setEpid(examPaperClassVo.getEpid());
1483
                 erStudentQtype.setQtypename(qtypename);
1488
                 erStudentQtype.setQtypename(qtypename);
1489
+                erStudentQtype.setQtypeid(qtypeid);
1484
                 erStudentQtype.setStusrate(N_Utils.getDoubleDivideAndMulitiply(erStudentQtype.getStuscore(), score));
1490
                 erStudentQtype.setStusrate(N_Utils.getDoubleDivideAndMulitiply(erStudentQtype.getStuscore(), score));
1485
                 stutypelist.add(erStudentQtype);
1491
                 stutypelist.add(erStudentQtype);
1486
             }
1492
             }

+ 1
- 1
sexam/src/main/resources/mapper/report/ERstudentMapper.xml View File

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

Loading…
Cancel
Save