学生作业报告-作答详情（未到显示答案时间，已生成报告除了答案、解析、知识点都可以查看）

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paperreport/PaperStudentReportMapper.java

@@ -24,11 +24,13 @@ public interface PaperStudentReportMapper {
 
     //题库作业试题
     List<Map> listTkSt(@Param("paperid") Integer paperid, @Param("classid") Integer classid
-            , @Param("studentid") Integer studentid,@Param("showanswer") Integer showanswer);
+            , @Param("studentid") Integer studentid, @Param("showanswer") Integer showanswer
+            , @Param("hasreport") Integer hasreport);
 
     //附件作业试题
     List<Map> listFjSt(@Param("paperid") Integer paperid, @Param("classid") Integer classid
-            ,@Param("studentid") Integer studentid,@Param("showanswer") Integer showanswer);
+            , @Param("studentid") Integer studentid, @Param("showanswer") Integer showanswer
+            , @Param("hasreport") Integer hasreport);
 
     //题库作业子题
     List<Map> listZtQuestion(@Param("questionids") List<String> questionids,@Param("psid") Integer psid

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

@@ -50,9 +50,10 @@ public class PaperStudentReportService {
         Map paper = paperStudentReportMapper.getPaperAnalyze(paperid, classid, studentid);
         Integer papertype = (Integer) paper.get("papertype");
         Integer showanswer = N_Utils.str2Int(paper.get("showanswer").toString());
+        Integer hasreport = N_Utils.str2Int(paper.get("hasreport").toString());
         List<Map> list;
         if (papertype == 1 || papertype == 3) {// 题库、靶向作业
-            list = paperStudentReportMapper.listTkSt(paperid, classid, studentid, showanswer);
+            list = paperStudentReportMapper.listTkSt(paperid, classid, studentid, showanswer, hasreport);
             List<Map> questions = new ArrayList<>();// 题库作业子题
             List<String> questionids = new ArrayList<>();
             list.forEach(t -> {
@@ -70,7 +71,7 @@ public class PaperStudentReportService {
                     if (q.get("qlevel").equals(2)) {
                         List<Map> sonques = questions.stream().filter(tq -> questionid.equals(tq.get("questionpid"))).collect(Collectors.toList());
                         q.put("sonques", sonques);
-                        if (showanswer == 1) {
+                        if (showanswer == 1 || hasreport == 1) {
                             Integer good = 0;
                             long count = sonques.stream().filter(s -> s.get("good").equals(1)).count();
                             if (count != 0) {
@@ -79,25 +80,27 @@ public class PaperStudentReportService {
                             q.put("good", good);
                         }
                     }
-                    if (showanswer == 1) {
+                    if (showanswer == 1 || hasreport == 1) {
                         if(N_Utils.isEmpty(q.get("classavgscore"))){
                             q.put("classavgscore",0);
                         }
                         if(N_Utils.isEmpty(q.get("classscorerate"))){
                             q.put("classscorerate",0);
                         }
-                        q.put("pointnames", getQuestionPoint(points, questionid));// 试题知识点
                         q.put("ratetype", StudyUtil.getScoreRateType(StudyUtil.objToDouble(q.get("scorerate"))));
                     }
+                    if (showanswer == 1) {
+                        q.put("pointnames", getQuestionPoint(points, questionid));// 试题知识点
+                    }
                 }
             }
         } else {// 附件作业
             String papername = paper.get("papername").toString();
-            list = paperStudentReportMapper.listFjSt(paperid, classid, studentid, showanswer);
+            list = paperStudentReportMapper.listFjSt(paperid, classid, studentid, showanswer, hasreport);
             for (Map t : list) {
                 for (Map q : (List<Map>) t.get("questions")) {
                     q.put("qstem", papername + "-第" + q.get("qn") + "题");
-                    if (showanswer == 1) {
+                    if (showanswer == 1 || hasreport == 1) {
                         if (N_Utils.isEmpty(q.get("classavgscore"))) {
                             q.put("classavgscore", 0);
                         }

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

@@ -25,7 +25,7 @@
     </select>
     <!--作业分析-->
     <select id="getPaperAnalyze" resultType="java.util.Map">
-        select p.paperid,p.papertype,p.papername,pa.pointjson,ifnull(ps.showanswer,0) as showanswer,ps.psid
+        select p.paperid,p.papertype,p.papername,p.hasreport,pa.pointjson,ifnull(ps.showanswer,0) as showanswer,ps.psid
         ,(select pc.showtype from t_paper_class pc where pc.paperid=ps.paperid and pc.classid=ps.classid)showtype
         from t_paper p left join t_paper_analyze pa on p.paperid = pa.paperid
         left join t_paper_student ps on p.paperid = ps.paperid
@@ -70,11 +70,14 @@
         select pq.qtypename,pq.ptid,pq.ptorder,psq.qorder,sum(psq.qscore) as qscore,tq.ctype,
         (if(tq.qlevel=1, pqq.qn, pqq.ptqorder)) as qn,
         pqq.questionpid as questionid,tq.qtypename qqtypename
-        <if test="showanswer==1">
+        <if test="showanswer==1 or hasreport==1">
             ,q.classavgscore,q.classscorerate,truncate(sum(psq.stuscore)*100/sum(psq.qscore),2) as scorerate
-            ,sum(psq.stuscore) as stuscore,psq.good,tq.qanswer,tq.qanalyze
+            ,sum(psq.stuscore) as stuscore,psq.good
             ,(if(tq.qlevel=1, psq.checkcomm, '')) as checkcomm
         </if>
+        <if test="showanswer==1">
+            ,tq.qanswer,tq.qanalyze
+        </if>
         ,psq.answered,psq.answertype,psq.useranswer,psq.converted,psq.useranswertxt
         ,tq.qstem,tq.qoption,tq.hashear,tq.hearfile,tq.qlevel
         from t_paper_qtype_question pqq left join t_paper_qtype pq on pqq.ptid=pq.ptid
@@ -89,9 +92,12 @@
     <select id="listFjSt" resultMap="typeResult">
         select pq.qtypename,pq.psqtypeid as ptid,pq.pstorder as ptorder,ps.qn,ps.psorder as qorder
         ,ps.psscore as qscore,ps.ctype,ps.optionnum,ps.pscaid as ptqid,ps.qtypename as qqtypename
-        <if test="showanswer==1">
+        <if test="showanswer==1 or hasreport==1">
             ,q.classavgscore,q.classscorerate,truncate(pss.stuscore*100/pss.qscore,2)scorerate
-            ,pss.stuscore,pss.good,pss.checkcomm,ps.psanswer qanswer
+            ,pss.stuscore,pss.good,pss.checkcomm
+        </if>
+        <if test="showanswer==1">
+            ,ps.psanswer qanswer
         </if>
         ,pss.answered,pss.answertype,pss.useranswer,pss.converted,pss.useranswertxt
         from t_paper_scantron ps left join t_paper_student_scantron pss on ps.pscaid=pss.pscaid