学生作业报告、作业详情完善

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paperstudent/PaperStudentReportController.java

@@ -85,11 +85,12 @@ public class PaperStudentReportController {
      * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("p")
-    public ResultVo getPaper(@RequestBody TPaperClass paper) {
+    public ResultVo getPaper(@RequestBody PaperRstudent paper) {
         Integer paperid = paper.getPaperid();
         Integer classid = paper.getClassid();
-        N_Utils.validation(new Object[]{paperid, "作业id", 1, classid, "班级id", 1});
-        Map map = paperStudentReportService.getPaper(paperid, classid);
+        Integer studentid = paper.getStudentid();
+        N_Utils.validation(new Object[]{paperid, "作业id", 1, classid, "班级id", 1, studentid, "学生id", 1});
+        Map map = paperStudentReportService.getPaper(paperid, classid, studentid);
         return new ResultVo(0, "获取作业基本信息成功", map);
     }
 }

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

@@ -39,5 +39,5 @@ public interface PaperStudentReportMapper {
             ,@Param("papertype") Integer papertype);
 
     //作业基本信息
-    Map getPaper(@Param("paperid") Integer paperid, @Param("classid") Integer classid);
+    Map getPaper(@Param("paperid") Integer paperid, @Param("classid") Integer classid,@Param("studentid") Integer studentid);
 }

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

@@ -967,6 +967,8 @@ public class PaperService {
                     q.setScore(score);
                     q.setPtqorder(tq.getPtqorder());
                     q.setSonqlist(JSON.parseArray(JSON.toJSONString(list), Map.class));
+                    q.setQtypename(type.getQtypename());
+                    q.setComplexity(tq.getComplexity());
                 } else {
                     q = tq;
                 }

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

@@ -139,12 +139,12 @@ public class PaperStudentReportService {
 
     /**
      * @Description 作业基本信息
-     * @Param [paperid, classid]
+     * @Param [paperid, classid, studentid]
      * @Author ywx
      * @Date 2023/6/9 16:25
      * @return java.util.Map
      **/
-    public Map getPaper(Integer paperid, Integer classid) {
-        return paperStudentReportMapper.getPaper(paperid, classid);
+    public Map getPaper(Integer paperid, Integer classid, Integer studentid) {
+        return paperStudentReportMapper.getPaper(paperid, classid, studentid);
     }
 }

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

@@ -22,13 +22,15 @@
             <result property="hashear" column="hashear"></result>
             <result property="hearfile" column="hearfile"></result>
             <result property="qn" column="qn"></result>
+            <result property="complexity" column="complexity"></result>
+            <result property="qtypename" column="typename"></result>
         </collection>
     </resultMap>
     <!--获取作业题型列表-->
     <select id="listPaperType" resultMap="typeResult">
         select pt.qtypeid,pt.qtypename,pt.ptorder,pt.ptscore,pt.ptnum,ptq.questionid,ptq.ptqscore score,ptq.ptqorder,ptq.qn
         ,q.questionid,ifnull(q.questionpid,q.questionid)questionpid,q.qlevel,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze
-        ,q.hashear,q.hearfile,pt.ctype pctype
+        ,q.hashear,q.hearfile,q.complexity,q.qtypename typename,pt.ctype pctype
         from t_paper_qtype pt left join t_paper_qtype_question ptq on pt.ptid = ptq.ptid
         left join t_question q on ptq.questionid = q.questionid
         where pt.paperid=#{paperid} order by pt.ptorder,ptq.ptqid

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

@@ -153,8 +153,10 @@
     <!--作业基本信息-->
     <select id="getPaper" resultType="java.util.Map">
         select p.papername,p.papertype,p.paperclass,p.createtime,p.hasfile,p.committype,p.timetype
-        ,pg.starttime,pg.stoptime,pg.showtype,p.papernum,p.paperscore
+        ,pg.starttime,pg.stoptime,pg.showtype,ps.papernum,ps.paperscore,ps.showanswer
+        ,(case when ps.showanswer=1 then ps.userscore else 0 end)userscore
         from t_paper p left join t_paper_class pg on p.paperid = pg.paperid
-        where p.paperid=#{paperid} and pg.classid=#{classid}
+        left join t_paper_student ps on ps.paperid=pg.paperid and ps.classid=pg.classid
+        where p.paperid=#{paperid} and pg.classid=#{classid} and ps.studentid=#{studentid}
     </select>
 </mapper>

sstudy/src/main/resources/mapper/paperstudent/PaperStudentMapper.xml

@@ -342,7 +342,7 @@
     <!--获取学生作业状态-->
     <select id="getPaperState" resultType="java.util.Map">
         select s.psid,s.paperid,s.classid,s.studentid,s.psstate,s.pschecked
-        ,p.hasreport,p.papertype
+        ,p.hasreport,p.papertype,p.hasfile,p.hearfile
         ,(case when s.psstate=3 then (select psb.comm from t_paper_student_back psb
         where psb.psid=s.psid order by psbid desc limit 1) else null end)comm
         from t_paper_student s left join t_paper p on s.paperid=p.paperid