Merge remote-tracking branch 'origin/ywx' into wn

sstudy/src/main/java/com/xhkjedu/sstudy/model/paperstudent/TPaperStudent.java

@@ -35,6 +35,9 @@ public class TPaperStudent extends BaseBean {
     //批改状态0未批改1已批改2批改中
     private Integer pschecked;
 
+    //是否自动批阅0否 1是
+    private Integer autocheck;
+
     //作业开始时间
     private Integer starttime;
 

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

@@ -409,6 +409,7 @@ public class PaperStudentService {
             if (psqStudentCount <= 0) {//该学生作业已经全部批改完成
                 //作业学生关联表，学生批改状态置为已批改
                 pschecked = 1;
+                paperStudentBean.setAutocheck(1);
             }
             paperStudentBean.setPschecked(pschecked);
             result = paperStudentMapper.updatePaper(paperStudentBean);
@@ -782,6 +783,7 @@ public class PaperStudentService {
             if (psqStudentCount <= 0) {//该学生作业已经全部批改完成
                 //作业学生关联表，学生批改状态置为已批改
                 pschecked = 1;
+                paperStudentBean.setAutocheck(1);
             }
             paperStudentBean.setPschecked(pschecked);
             result = paperStudentMapper.updateSPaper(paperStudentBean);

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

@@ -303,6 +303,7 @@ public class PaperStudentWebService {
             Integer pschecked = 0;
             if (checknum == psqs.size()){//如果自动批改试题数量等于试题总量，批改状态改为1已批改
                 pschecked = 1;
+                ps.setAutocheck(1);
             }
             ps.setPschecked(pschecked);
             ps.setCosttime(paper.getCosttime());
@@ -487,6 +488,7 @@ public class PaperStudentWebService {
             Integer pschecked = 0;
             if (checknum == psqs.size()){//如果自动批改试题数量等于试题总量，批改状态改为1已批改
                 pschecked = 1;
+                ps.setAutocheck(1);
             }
             ps.setPschecked(pschecked);
             ps.setCosttime(paper.getCosttime());

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

@@ -360,7 +360,7 @@
     <select id="listStudent" resultMap="studentResult">
         select ps.psid,ps.studentid,u.username studentname,ps.pschecked
         from t_paper_student ps left join t_user u on ps.studentid=u.userid
-        where ps.paperid=#{paperid} and ps.classid=#{classid} and ps.psstate in(1,2,4)
+        where ps.paperid=#{paperid} and ps.classid=#{classid} and ps.psstate in(1,2,4) and ps.autocheck=0
         order by ps.pschecked,convert(u.username using gbk),u.userid
     </select>
     <select id="listStudentsByPaperIdCheckId" resultMap="checkResult">

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

@@ -301,6 +301,7 @@
     <update id="submitPaper">
         update t_paper_student set stoptime=#{ps.stoptime},costtime=ifnull(costtime,0)+#{ps.costtime}
         ,psstate=#{ps.psstate},userscore=#{ps.userscore},pschecked=#{ps.pschecked},showanswer=#{ps.showanswer}
+        <if test="ps.autocheck!=null">,autocheck=#{ps.autocheck}</if>
         where psid=#{ps.psid}
     </update>
     <!--批量修改题库作业学生作答信息-->
@@ -374,6 +375,7 @@
         update t_paper_student set stoptime=#{ps.stoptime},costtime=#{ps.costtime}
         ,psstate=#{ps.psstate},pschecked=#{ps.pschecked},showanswer=#{ps.showanswer}
         ,userscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM t_paper_student_scantron q WHERE q.psid=#{ps.psid})
+        <if test="ps.autocheck!=null">,autocheck=#{ps.autocheck}</if>
         where psid=#{ps.psid}
     </update>
     <!--题库作业提交更新操作-->
@@ -381,6 +383,7 @@
         update t_paper_student set stoptime=#{ps.stoptime},costtime=#{ps.costtime}
         ,psstate=#{ps.psstate},pschecked=#{ps.pschecked},showanswer=#{ps.showanswer}
         ,userscore=(SELECT SUM(IFNULL(q.stuscore,0)) FROM t_paper_student_question q WHERE q.psid=#{ps.psid})
+        <if test="ps.autocheck!=null">,autocheck=#{ps.autocheck}</if>
         where psid=#{ps.psid}
     </update>
     <!--作业学生列表-->