按班级获取待批试题完善

smarking/src/main/java/com/xhkjedu/smarking/service/papercheck/MsPaperCheckTeacherTaskService.java

@@ -214,9 +214,11 @@ public class MsPaperCheckTeacherTaskService {
             if (N_Utils.isListEmpty(checks)) throw new ServiceException("暂无要批阅的班级");
             for (MsPaperCheck check : checks) {
                 check.setTeacherid(handleid);
+                check.setMptqid(param.getMptqid());
                 sq = msPaperCheckTeacherTaskMapper.getCorrectClassQuestion(check);
                 if (sq != null) {
                     paperCheck = check;
+                    paperCheck.setMptqid(sq.getMptqid());
                     break;
                 }
             }

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherTaskMapper.xml

@@ -11,9 +11,9 @@
     </insert>
     <!--保存或更新单个任务-->
     <insert id="save">
-        insert into ms_paper_check_teacher_task (mpid, mblockid, teacherid, taskorder, mpsbid, checktype, createtime)
-        values (#{s.mpid},#{s.mblockid},#{s.teacherid},#{s.taskorder},#{s.mpsbid},#{s.checktype},#{s.createtime})
-        on duplicate key update taskorder=#{s.taskorder},teacherid=#{s.teacherid}
+        insert into ms_paper_check_teacher_task (mpid, mblockid, mptqid, teacherid, taskorder, mpsbid, checktype, createtime)
+        values (#{s.mpid},#{s.mblockid},#{s.mptqid},#{s.teacherid},#{s.taskorder},#{s.mpsbid},#{s.checktype},#{s.createtime})
+        on duplicate key update taskorder=#{s.taskorder},teacherid=#{s.teacherid},mblockid=#{s.mblockid}
     </insert>
     <!--批量更新任务信息-->
     <update id="batchUpdate">
@@ -565,6 +565,9 @@
             from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
             and pctt.checkstate!=3 and psq.hasproblem=0
+            <if test="param.mptqid!=null and param.mptqid!=0">
+                and psq.mptqid=#{param.mptqid}
+            </if>
             order by field(pctt.checkstate,2,1,3),pctt.taskorder
             limit 1
         </if>
@@ -583,6 +586,9 @@
             </if>
             )))
             and psq.hasproblem=0
+            <if test="param.mptqid!=null and param.mptqid!=0">
+                and psq.mptqid=#{param.mptqid}
+            </if>
             order by field(psq.checked,2,1,3),psq.mptqid
             limit 1
         </if>