附件作业相关qn

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

@@ -274,11 +274,13 @@ public class PaperService {
             List<Integer> eptqidlist = new ArrayList<>();
             List<Double> scorelist = new ArrayList<>();
             List<String> qnamelist = new ArrayList<>();
+            List<String> qnlist = new ArrayList<>();
             for(TPaperScantronQtype t : aq){
                 List<TPaperScantron> qlist = t.getScantrons();
                 for(TPaperScantron q : qlist){
                     orderlist.add(q.getPsorder());
                     eptqidlist.add(q.getId());
+                    qnlist.add(q.getQn());
                     scorelist.add(q.getPsscore());
                     qnamelist.add(q.getQtypename());
                 }
@@ -287,6 +289,7 @@ public class PaperService {
             Map anmap = new TreeMap();//题型对应试题的id和基础信息
             anmap.put("orders",orderlist);
             anmap.put("eptqids",eptqidlist);
+            anmap.put("qns",qnlist);
             anmap.put("scores",scorelist);
             anmap.put("qtypenames",qnamelist);
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/AnalyzeQuestionVo.java

@@ -13,6 +13,9 @@ public class AnalyzeQuestionVo {
     //题号
     private Integer ptqorder;
 
+    //题号
+    private String qn;
+
     //题型名称
     private String qtypename;
 

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

@@ -101,7 +101,7 @@
     </select>
     <!--答题卡作业统计按题-->
     <select id="getSQuestionAnalyze" resultType="com.xhkjedu.sstudy.vo.paper.AnalyzeQuestionVo">
-        SELECT ps.paperid,ps.psorder ptqorder,ps.qtypename,ps.psscore totalscore,ps.psanswer qanswer,ps.ctype,truncate(avg(pss.stuscore),2)avgscore
+        SELECT ps.paperid,ps.psorder ptqorder,ps.qn,ps.qtypename,ps.psscore totalscore,ps.psanswer qanswer,ps.ctype,truncate(avg(pss.stuscore),2)avgscore
         ,truncate(avg(pss.costtime),2)avgtime,min(pss.costtime)mintime
         ,truncate(sum(case when pss.answered=1 then 1 else 0 end)*100/count(ps1.psid),2)commitrate
         ,truncate(SUM(IFNULL(pss.stuscore,0))*100/(ps.psscore*count(ps1.psid)),2)scorerate