学生作业报告作业详情显示答案控制

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

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

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

@@ -49,9 +49,10 @@ public class PaperStudentReportService {
     public Map getPaperDetail(Integer paperid, Integer classid, Integer studentid) {
         Map paper = paperStudentReportMapper.getPaperAnalyze(paperid, classid, studentid);
         Integer papertype = (Integer) paper.get("papertype");
+        Integer showanswer = N_Utils.str2Int(paper.get("showanswer").toString());
         List<Map> list;
         if (papertype == 1 || papertype == 3) {// 题库、靶向作业
-            list = paperStudentReportMapper.listTkSt(paperid, classid, studentid);
+            list = paperStudentReportMapper.listTkSt(paperid, classid, studentid, showanswer);
             List<Map> questions = new ArrayList<>();// 题库作业子题
             List<String> questionids = new ArrayList<>();
             list.forEach(t -> {
@@ -60,45 +61,51 @@ public class PaperStudentReportService {
                                                .map(q -> q.get("questionid").toString()).collect(Collectors.toList()));
             });
 
-            if (N_Utils.isListNotEmpty(questionids)) questions = paperStudentReportMapper.listZtQuestion(questionids, (Integer) paper.get("psid"));
+            if (N_Utils.isListNotEmpty(questionids)) questions = paperStudentReportMapper.listZtQuestion(questionids, (Integer) paper.get("psid"), showanswer);
             Object pointjson = paper.get("pointjson");
             List<Map> points = JSON.parseArray(pointjson.toString(), Map.class);
             for (Map t : list) {
                 for (Map q : (List<Map>) t.get("questions")) {
                     String questionid = q.get("questionid").toString();
-                    q.put("pointnames", getQuestionPoint(points, questionid));// 试题知识点
                     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);
-                        Integer good = 0;
-                        long count = sonques.stream().filter(s -> s.get("good").equals(1)).count();
-                        if (count != 0) {
-                            good = 1;
+                        if (showanswer == 1) {
+                            Integer good = 0;
+                            long count = sonques.stream().filter(s -> s.get("good").equals(1)).count();
+                            if (count != 0) {
+                                good = 1;
+                            }
+                            q.put("good", good);
                         }
-                        q.put("good", good);
                     }
-                    if(N_Utils.isEmpty(q.get("classavgscore"))){
-                        q.put("classavgscore",0);
-                    }
-                    if(N_Utils.isEmpty(q.get("classscorerate"))){
-                        q.put("classscorerate",0);
+                    if (showanswer == 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"))));
                     }
-                    q.put("ratetype", StudyUtil.getScoreRateType(StudyUtil.objToDouble(q.get("scorerate"))));
                 }
             }
         } else {// 附件作业
             String papername = paper.get("papername").toString();
-            list = paperStudentReportMapper.listFjSt(paperid, classid, studentid);
+            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") + "题");
-                    if(N_Utils.isEmpty(q.get("classavgscore"))){
-                        q.put("classavgscore",0);
-                    }
-                    if(N_Utils.isEmpty(q.get("classscorerate"))){
-                        q.put("classscorerate",0);
+                    if (showanswer == 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("ratetype", StudyUtil.getScoreRateType(StudyUtil.objToDouble(q.get("scorerate"))));
                     }
-                    q.put("ratetype", StudyUtil.getScoreRateType(StudyUtil.objToDouble(q.get("scorerate"))));
                 }
             }
         }

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,ps.showanswer,ps.psid
+        select p.paperid,p.papertype,p.papername,pa.pointjson,ifnull(ps.showanswer,0)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
@@ -69,10 +69,13 @@
     <select id="listTkSt" resultMap="typeResult">
         select pq.qtypename,pq.ptid,pq.ptorder,pqq.qn,psq.qorder,sum(psq.qscore)qscore,tq.ctype,
         pqq.questionpid questionid,tq.qtypename qqtypename
-        ,q.classavgscore,q.classscorerate,truncate(sum(psq.stuscore)*100/sum(psq.qscore),2)scorerate
-        ,sum(psq.stuscore)stuscore,psq.answertype,psq.useranswer,psq.converted,psq.useranswertxt,psq.good
-        ,(case when tq.qlevel=1 then psq.checkcomm else '' end)checkcomm,psq.answered
-        ,tq.qstem,tq.qoption,tq.qanswer,tq.qanalyze,tq.hashear,tq.hearfile,tq.qlevel
+        <if test="showanswer==1">
+            ,q.classavgscore,q.classscorerate,truncate(sum(psq.stuscore)*100/sum(psq.qscore),2)scorerate
+            ,sum(psq.stuscore)stuscore,psq.good,tq.qanswer,tq.qanalyze
+            ,(case when tq.qlevel=1 then psq.checkcomm else '' end)checkcomm
+        </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
         left join t_paper_student_question psq on pqq.paperid=psq.paperid
         and psq.classid=#{classid} and psq.studentid=#{studentid} and pqq.questionid=psq.questionid
@@ -84,10 +87,12 @@
     <!--附件作业试题-->
     <select id="listFjSt" resultMap="typeResult">
         select pq.qtypename,pq.psqtypeid ptid,pq.pstorder ptorder,ps.qn,ps.psorder qorder,ps.psscore qscore,ps.ctype,
-        ps.psanswer qanswer,ps.optionnum,ps.pscaid ptqid,ps.qtypename qqtypename,
-        q.classavgscore,q.classscorerate,truncate(pss.stuscore*100/pss.qscore,2)scorerate
-        ,pss.stuscore,pss.answertype,pss.useranswer,pss.converted,pss.useranswertxt,pss.good
-        ,pss.checkcomm,pss.answered
+        ps.optionnum,ps.pscaid ptqid,ps.qtypename qqtypename
+        <if test="showanswer==1">
+            ,q.classavgscore,q.classscorerate,truncate(pss.stuscore*100/pss.qscore,2)scorerate
+            ,pss.stuscore,pss.good,pss.checkcomm,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
         left join t_paper_scantron_qtype pq on ps.psqtypeid=pq.psqtypeid
         left join t_paper_rclass_question q
@@ -98,9 +103,11 @@
     <!--题库作业子题-->
     <select id="listZtQuestion" resultType="java.util.Map">
         select q.questionid,q.questionpid,q.qscore,q.qn
-        ,q.stuscore,q.answertype,q.useranswer,q.converted,q.useranswertxt,q.good
-        ,ifnull(q.checkcomm,'')checkcomm,q.answered
-        ,tq.sorder,tq.qstem,tq.qoption,tq.qanswer,tq.qanalyze,tq.ctype,tq.qtypename
+        ,q.answered,q.answertype,q.useranswer,q.converted,q.useranswertxt
+        <if test="showanswer==1">
+            ,q.stuscore,q.good,ifnull(q.checkcomm,'')checkcomm,tq.qanswer,tq.qanalyze
+        </if>
+        ,tq.sorder,tq.qstem,tq.qoption,tq.ctype,tq.qtypename
         from t_question tq right join t_paper_student_question q on tq.questionid=q.questionid
         where q.psid=#{psid} and tq.questionpid in
         <foreach collection="questionids" item="questionid" open="(" separator="," close=")">#{questionid}</foreach>