学生网页端开始做作业完善 优秀作答完善

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

@@ -404,7 +404,13 @@ public class PaperStudentController {
     */
     @PostMapping("/delgood")
     public ResultVo updateStudentQuestionGood(@RequestBody PaperStudentQuestionVo ps) {
-        N_Utils.validation(new Object[]{ps.getPsqid(), "学生试题id", 1,ps.getPapertype(),"作业类型",1});
+        Integer papertype = ps.getPapertype();
+        N_Utils.validation(new Object[]{papertype, "作业类型", 1});
+        if (papertype == 2) {
+            N_Utils.validation(new Object[]{ps.getPsqid(), "学生试题id", 1});
+        } else {
+            N_Utils.validation(new Object[]{ps.getPsid(), "试卷学生id", 1, ps.getQuestionpid(), "母题id", 2});
+        }
         paperStudentService.updatePaperStudentQuesGood(ps);
         return new ResultVo(0, "取消学生试题优秀作答成功");
     }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paperstudent/PaperStudentMapper.java

@@ -5,10 +5,7 @@ import com.xhkjedu.sstudy.model.paperstudent.TPaperStudent;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudentQuestion;
 import com.xhkjedu.sstudy.vo.paper.PaperCheckParam;
 import com.xhkjedu.sstudy.vo.paperreport.PaperRStuVo;
-import com.xhkjedu.sstudy.vo.paperstudent.PaperCommVo;
-import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
-import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentVo;
-import com.xhkjedu.sstudy.vo.paperstudent.StudentVo;
+import com.xhkjedu.sstudy.vo.paperstudent.*;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -212,4 +209,7 @@ public interface PaperStudentMapper extends TkMapper<TPaperStudent> {
 
     //班级作业学生列表
     List<StudentVo> listStu(@Param("paperid") Integer paperid,@Param("classid") Integer classid);
+
+    //学生作业基本信息
+    StudentPaperVo getStudentPaper(@Param("psid") Integer psid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paperstudent/PaperStudentQuestionMapper.java

@@ -127,5 +127,6 @@ public interface PaperStudentQuestionMapper extends TkMapper<TPaperStudentQuesti
     int updatePaperStudentGoodByPsid(@Param("psid") Integer psid);
 
     //标记单题是否优秀作答
-    int updatePaperStudentGoodByPsqid(@Param("good") Integer good,@Param("psqid") Integer psqid);
+    int updatePaperStudentGoodByPsqid(@Param("good") Integer good, @Param("psid") Integer psid
+            ,@Param("questionpid") String questionpid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentService.java

@@ -1099,7 +1099,7 @@ public class PaperStudentService {
             //附件作业
             paperStudentScantronMapper.updatePaperStudentGoodByPsqid(0,psq.getPsqid());
         }else{
-            paperStudentQuestionMapper.updatePaperStudentGoodByPsqid(0,psq.getPsqid());
+            paperStudentQuestionMapper.updatePaperStudentGoodByPsqid(0, psq.getPsid(), psq.getQuestionpid());
         }
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentWebService.java

@@ -86,7 +86,7 @@ public class PaperStudentWebService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public StudentPaperVo startPaper(Integer psid) {
-        StudentPaperVo paper = paperAnalyzeMapper.getStudentPaperAnalyze(psid);
+        StudentPaperVo paper = paperStudentMapper.getStudentPaper(psid);
         try {
             List<StudentPaperTypeVo> types = paperAnalyzeMapper.listPeopleDetailAnalyze(psid);
             if (N_Utils.isListEmpty(types)){
@@ -129,7 +129,7 @@ public class PaperStudentWebService {
      * @return com.xhkjedu.vo.paperstudent.StudentPaperVo
      **/
     public StudentPaperVo scantronStartPaper(Integer psid){
-        StudentPaperVo paper = paperAnalyzeMapper.getStudentPaperAnalyze(psid);
+        StudentPaperVo paper = paperStudentMapper.getStudentPaper(psid);
         List<StudentPaperTypeVo> types = paperAnalyzeMapper.listPeopleSDetailAnalyze(psid);
         if (N_Utils.isListEmpty(types)){
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/StudentPaperVo.java

@@ -87,4 +87,10 @@ public class StudentPaperVo {
 
     //提交形式：图片,文字,视频,音频 ["image","text","video","audio"]
     private String committype;
+
+    //作业分类1课前2课后
+    private Integer paperclass;
+
+    //创建时间
+    private Integer createtime;
 }

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

@@ -123,11 +123,13 @@
             <result property="username" column="username"></result>
             <result property="headpic" column="headpic"></result>
             <result property="qorder" column="qorder"></result>
+            <result property="psid" column="psid"></result>
             <collection property="questions" ofType="java.util.Map" javaType="java.util.List">
                 <result property="studentid" column="studentid"></result>
                 <result property="qn" column="qn"></result>
                 <result property="qorder" column="qorder"></result>
-                <result property="questionid" column="questionid"></result>
+                <result property="psqid" column="psqid"></result>
+                <result property="questionpid" column="questionpid"></result>
                 <result property="stuscore" column="stuscore"></result>
                 <result property="answertype" column="answertype"></result>
                 <result property="useranswer" column="useranswer"></result>
@@ -139,9 +141,9 @@
     </resultMap>
     <select id="listGoodAnswer" resultMap="answerResult">
         select q.qorder,q.qn,q.stuscore,q.answertype,q.useranswer,q.converted,q.useranswertxt,q.checkcomm
-        ,q.studentid,u.username,u.headpic
-        <if test="papertype!=2">,q.qorder mqn from t_paper_student_question q</if>
-        <if test="papertype==2">,q.qn mqn from t_paper_student_scantron q</if>
+        ,q.studentid,q.psid,u.username,u.headpic
+        <if test="papertype!=2">,q.qorder mqn,q.psqid,q.questionpid from t_paper_student_question q</if>
+        <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)

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

@@ -368,4 +368,14 @@
         from t_paper_student ps
         where ps.paperid=#{paperid} and ps.classid=#{classid}
     </select>
+    <!--学生作业基本信息-->
+    <select id="getStudentPaper" resultType="com.xhkjedu.sstudy.vo.paperstudent.StudentPaperVo">
+        select p.createtime,p.papername,p.papertype,p.paperclass,p.committype,p.hearfile,u.username createname
+        ,ps.paperid,ps.classid,ps.papernum,ps.paperscore,ps.questionids
+        ,pg.showtype,pg.starttime,pg.stoptime
+        from t_paper_student ps left join t_paper p on ps.paperid=p.paperid
+        left join t_paper_class pg on ps.paperid=pg.paperid and ps.classid=pg.classid
+        left join t_user u on p.createid=u.userid
+        where ps.psid=#{psid}
+    </select>
 </mapper>

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

@@ -137,6 +137,6 @@
 
     <!--标记单题是否优秀作答-->
     <update id="updatePaperStudentGoodByPsqid">
-        update t_paper_student_question set good=#{good} where psqid=#{psqid}
+        update t_paper_student_question set good=#{good} where psid=#{psid} and questionpid=#{questionpid}
     </update>
 </mapper>