批阅添加学生批改后图片

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

     <!--获取待仲裁任务-->
     <select id="getCorrectArbitrate" resultType="java.util.Map">
         <if test="param.correcttype==3">
-            select pc.mpid,pc.mblockid,pc.correcttype,psb.stuanswer,psb.mpsbid,psb.arbitratescore,2 as answertype
+            select pc.mpid,pc.mblockid,pc.correcttype,psb.stuanswer,psb.stumerge,psb.mpsbid,psb.arbitratescore,2 as answertype
             from ms_paper_check pc inner join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
             where pc.mpid=#{param.mpid} and pc.arbitrateid=#{param.handleid}
             and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
             order by psb.mpsbid limit 1
         </if>
         <if test="param.correcttype==2">
-            select pc.mpid,pc.mblockid,pc.correcttype,psb.stuanswer,psb.mpsqid as mpsbid,psb.arbitratescore,psb.answertype
+            select pc.mpid,pc.mblockid,pc.correcttype,psb.stuanswer,psb.stumerge,psb.mpsqid as mpsbid,psb.arbitratescore,psb.answertype
             from ms_paper_check pc inner join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
             where pc.mpid=#{param.mpid} and pc.arbitrateid=#{param.handleid}
             and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
     <!--教师阅卷-待仲裁-上一份-->
     <select id="getPreArbitrate" resultType="java.util.Map">
         <if test="param.correcttype==3">
-            select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psb.stuanswer,psb.mpsbid,psb.arbitratescore,2 as answertype
+            select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psb.stuanswer,psb.stumerge,psb.mpsbid,psb.arbitratescore,2 as answertype
             from ms_paper_student_block psb inner join ms_paper_check_teacher_arbitrate pcta on pcta.mpid=psb.mpid and pcta.mpsbid=psb.mpsbid
             where pcta.mpid=#{param.mpid} and pcta.teacherid=#{param.handleid} and pcta.mblockid=#{param.mblockid}
             and pcta.checkstate=3 and #{param.taskorder}>pcta.taskorder
             order by pcta.taskorder desc limit 1
         </if>
         <if test="param.correcttype==2">
-            select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psb.stuanswer,pcta.mpsbid,psb.arbitratescore,psb.answertype
+            select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psb.stuanswer,psb.stumerge,pcta.mpsbid,psb.arbitratescore,psb.answertype
             from ms_paper_student_question psb inner join ms_paper_check_teacher_arbitrate pcta on pcta.mpid=psb.mpid and pcta.mpsbid=psb.mpsqid
             where pcta.mpid=#{param.mpid} and pcta.teacherid=#{param.handleid} and pcta.mblockid=#{param.mblockid}
             and pcta.checkstate=3 and #{param.taskorder}>pcta.taskorder
     <!--学科组长-获取待仲裁任务-->
     <select id="getCorrectLeaderArbitrate" resultType="java.util.Map">
         <if test="param.correcttype==3">
-            select psb.mpid,psb.mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.mpsbid,psb.arbitratescore,2 as answertype
+            select psb.mpid,psb.mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.stumerge,psb.mpsbid,psb.arbitratescore,2 as answertype
             from ms_paper_student_block psb
             where psb.mpid=#{param.mpid} and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
             order by psb.mpsbid limit 1
         </if>
         <if test="param.correcttype==2">
-            select psb.mpid,psb.mpsqid as mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.mpsqid as mpsbid,psb.arbitratescore,psb.answertype
+            select psb.mpid,psb.mpsqid as mblockid,#{param.correcttype} as correcttype,psb.stuanswer,psb.stumerge,psb.mpsqid as mpsbid,psb.arbitratescore,psb.answertype
             from ms_paper_student_question psb
             where psb.mpid=#{param.mpid} and (psb.arbitratestate=1 or (psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid}))
             order by psb.mpsqid limit 1
     </select>
     <!--仲裁历史详情-->
     <select id="detailHistory" resultType="java.util.Map">
-        select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psq.stuanswer,pcta.mpsbid,psq.arbitratescore
+        select pcta.mpid,pcta.mblockid,#{param.correcttype} as correcttype,pcta.taskorder,psq.stuanswer,psq.stumerge,pcta.mpsbid,psq.arbitratescore
         ,if(#{param.correcttype}=3,2,psq.answertype) as answertype
         from ms_paper_check_teacher_arbitrate pcta
         <if test="param.correcttype==3">

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

     </select>
     <!--获取疑难卷任务-->
     <select id="getCorrectProblem" resultType="java.util.Map">
-        select psb.stuanswer,psb.hasproblem,psb.problemtype,psb.problemcomm
+        select psb.stuanswer,psb.stumerge,psb.hasproblem,psb.problemtype,psb.problemcomm
         <if test="param.correcttype==3">
             ,psb.mblockid,psb.mpsbid,2 as answertype
         </if>
     </select>
     <!--获取上一份疑难卷-->
     <select id="getPreProblem" resultType="java.util.Map">
-        select psq.stuanswer,psq.hasproblem,psq.problemtype,psq.problemcomm
+        select psq.stuanswer,psq.stumerge,psq.hasproblem,psq.problemtype,psq.problemcomm
         ,pctp.mpid,pctp.mblockid,pctp.mpsbid,pctp.taskorder,pctp.checkscore
         ,if(#{param.correcttype}=3,2,psq.answertype) as answertype
         ,u.username as studentname,u.examno,u2.username as teachername
     </select>
     <!--历史记录详情-->
     <select id="detailHistory" resultType="java.util.Map">
-        select psq.stuanswer,psq.hasproblem,psq.problemtype,psq.problemcomm
+        select psq.stuanswer,psq.stumerge,psq.hasproblem,psq.problemtype,psq.problemcomm
         ,pctp.mpid,pctp.mblockid,pctp.mpsbid,pctp.taskorder,pctp.checkscore
         ,if(#{param.correcttype}=3,2,psq.answertype) as answertype
         ,u.username as studentname,u.examno,u2.username as teachername

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

     <!--教师阅卷-按题块-获取待批试题-->
     <select id="getCorrectBlock" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
         <if test="param.dispenseway!=null and param.dispenseway!=2">
-            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,2 as answertype
             ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.checktype
             from ms_paper_student_block psq inner join ms_paper_check_teacher_task pctt on psq.mpsbid = pctt.mpsbid and psq.mpid=pctt.mpid
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
-            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,2 as answertype
             ,psq.mblockid,psq.mpsbid,psq.firstcid
             from ms_paper_student_block psq
     <!--教师阅卷-按试题-获取待批试题-->
     <select id="getCorrectQuestion" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
         <if test="param.dispenseway!=null and param.dispenseway!=2">
-            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
             ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.checktype
             from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
-            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
             ,psq.mptqid as mblockid,psq.mpsqid as mpsbid,psq.mptqid,psq.firstcid
             from ms_paper_student_question psq
     <!--教师阅卷-按班级-获取待批试题-->
     <select id="getCorrectClassQuestion" resultType="com.xhkjedu.smarking.vo.papercheck.MsPaperCheckVo">
         <if test="param.dispenseway!=null and param.dispenseway!=2">
-            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
             ,pctt.mpid,pctt.mblockid,pctt.mpsbid,pctt.mptqid,pctt.checktype
             from ms_paper_student_question psq inner join ms_paper_check_teacher_task pctt on psq.mpsqid = pctt.mpsbid and psq.mpid=pctt.mpid
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
-            select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+            select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
             ,psq.answertype
             ,c.classid as mblockid,psq.mpsqid as mpsbid,psq.mptqid,psq.firstcid
             from ms_paper_student_question psq inner join ms_class c on c.examid=psq.examid and c.subjectid=psq.subjectid
     </select>
     <!--教师阅卷-上一份-->
     <select id="getPreCorrect" resultType="java.util.Map">
-        select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+        select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
         <if test="param.correcttype==3">
             ,2 as answertype
         </if>
     </select>
     <!--教师阅卷-历史详情-->
     <select id="detailHistory" resultType="java.util.Map">
-        select psq.stuanswer,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
+        select psq.stuanswer,psq.stumerge,psq.hasgood,psq.hasbad,psq.hasproblem,psq.problemtype,psq.problemcomm
         <if test="param.correcttype==3">
              ,2 as answertype
         </if>