学生作业报告-试卷详情优化 附件作业题干（作业名称拼接qn）

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

@@ -213,7 +213,7 @@ public class EReportClassService {
             String examname = paper.get("examname").toString();
             list = eReportClassMapper.listFjSjGk(rank);
             for (Map q : list) {
-                q.put("qstem", examname + "-第" + q.get("qorder") + "题");
+                q.put("qstem", examname + "-第" + q.get("qn") + "题");
             }
         }
         paper.remove("examname");

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperreport/PaperReportService.java

@@ -1219,7 +1219,7 @@ public class PaperReportService {
             list = paperReportMapper.listFjSt(paperid, classid);
             for (Map t : list) {
                 for (Map q : (List<Map>) t.get("questions")) {
-                    q.put("qstem", papername + "-第" + q.get("qorder") + "题");
+                    q.put("qstem", papername + "-第" + q.get("qn") + "题");
                     q.put("classratetype", StudyUtil.getScoreRateType(StudyUtil.objToDouble(q.get("classscorerate"))));
                     if(N_Utils.isEmpty(q.get("classavgscore"))){
                         q.put("classavgscore",0);

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperreport/PaperStudentReportService.java

@@ -96,7 +96,7 @@ public class PaperStudentReportService {
             list = paperStudentReportMapper.listFjSt(paperid, classid, studentid, showanswer);
             for (Map t : list) {
                 for (Map q : (List<Map>) t.get("questions")) {
-                    q.put("qstem", papername + "-第" + q.get("qorder") + "题");
+                    q.put("qstem", papername + "-第" + q.get("qn") + "题");
                     if (showanswer == 1) {
                         if (N_Utils.isEmpty(q.get("classavgscore"))) {
                             q.put("classavgscore", 0);

sstudy/src/main/resources/mapper/paperreport/PaperStudentReportMapper.xml

@@ -67,7 +67,8 @@
     </resultMap>
     <!--题库作业试题-->
     <select id="listTkSt" resultMap="typeResult">
-        select pq.qtypename,pq.ptid,pq.ptorder,pqq.qn,psq.qorder,sum(psq.qscore)qscore,tq.ctype,
+        select pq.qtypename,pq.ptid,pq.ptorder,psq.qorder,sum(psq.qscore)qscore,tq.ctype,
+        (case when tq.qlevel=1 then pqq.qn else pqq.ptqorder end)qn,
         pqq.questionpid questionid,tq.qtypename qqtypename
         <if test="showanswer==1">
             ,q.classavgscore,q.classscorerate,truncate(sum(psq.stuscore)*100/sum(psq.qscore),2)scorerate
@@ -146,7 +147,7 @@
         <if test="papertype==2">,q.qn mqn,q.pssid psqid from t_paper_student_scantron q</if>
         left join t_user u on q.studentid=u.userid
         where q.paperid=#{paperid} and q.classid=#{classid} and good=1
-        order by q.qorder,convert(u.username using gbk)
+        order by q.qorder,q.qn,convert(u.username using gbk)
     </select>
     <!--作业基本信息-->
     <select id="getPaper" resultType="java.util.Map">