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

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassTop.java

@@ -23,6 +23,8 @@ public class MsrClassTop extends BaseBean {
     private Integer classid;
     //科目ID（含总分）
     private String subjectid;
+    //参考人数
+    private Integer stunum;
     //班级前60%人数
     private Integer btnum;
     //班前60%所占班级人数比例

smarking/src/main/java/com/xhkjedu/smarking/model/stupaper/MsPaperStudentBlock.java

@@ -33,6 +33,8 @@ public class MsPaperStudentBlock extends BaseBean {
     private Integer mpsid;
     //学生答案图片
     private String stuanswer;
+    //学生批改后图片
+    private String stumerge;
     //是否转换0默认1待转换2转换成功3转换失败
     private Integer converted;
     //是否批阅0默认1待批阅2批阅中3已批阅

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

@@ -145,6 +145,7 @@ public class MsPaperCheckTeacherArbitrateService {
         Integer hasgood = param.getHasgood();
         Integer hasbad = param.getHasbad();
         Integer mpsid;
+        String stumerge = param.getStumerge();
         if (correcttype.equals(3)) {//按题块批阅
             MsPaperStudentBlock block = msPaperStudentBlockMapper.selectByPrimaryKey(mpsbid);
             mpsid = block.getMpsid();
@@ -224,6 +225,7 @@ public class MsPaperCheckTeacherArbitrateService {
             psq.setFinalreason(finalreason);
             psq.setHasgood(hasgood);
             psq.setHasbad(hasbad);
+            psq.setStumerge(stumerge);
             msPaperStudentBlockMapper.updateByPrimaryKeySelective(psq);
             msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, psq);
         } else {
@@ -260,6 +262,7 @@ public class MsPaperCheckTeacherArbitrateService {
             psq.setFinalreason(finalreason);
             psq.setHasgood(hasgood);
             psq.setHasbad(hasbad);
+            psq.setStumerge(stumerge);
             msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
         }
         msPaperCheckTeacherArbitrateMapper.correct(param);

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

@@ -124,6 +124,7 @@ public class MsPaperCheckTeacherProblemService {
         Double arbitratescore = param.getArbitratescore();
         Integer hasgood = param.getHasgood();
         Integer hasbad = param.getHasbad();
+        String stumerge = param.getStumerge();
         if (correcttype.equals(3)) {//按题块批阅
             List<MsPaperBlockQuestion> questions = param.getQuestions();
             List<MsPaperStudentQuestion> studentQuestions = new ArrayList<>();
@@ -165,6 +166,7 @@ public class MsPaperCheckTeacherProblemService {
             psq.setHasbad(hasbad);
             psq.setHasproblem(3);
             psq.setProblehid(handleid);
+            psq.setStumerge(stumerge);
             msPaperStudentBlockMapper.updateByPrimaryKeySelective(psq);
             msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, psq);
         } else {
@@ -177,6 +179,7 @@ public class MsPaperCheckTeacherProblemService {
             psq.setHasbad(hasbad);
             psq.setHasproblem(3);
             psq.setProblehid(handleid);
+            psq.setStumerge(stumerge);
             msPaperStudentQuestionMapper.updateByPrimaryKeySelective(psq);
         }
         msPaperCheckTeacherProblemMapper.correct(param);

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

@@ -397,6 +397,7 @@ public class MsPaperCheckTeacherTaskService {
         Integer arbitratestate = null;
         MsCheckVo result = msPaperCheckTeacherTaskMapper.getCheckResult(param);
         Integer mpsid = result.getMpsid();
+        String stumerge = param.getStumerge();
         if (checktype.equals(1)) {//单评
             if (hasproblem.equals(0)) {
                 checked = 3;
@@ -415,6 +416,7 @@ public class MsPaperCheckTeacherTaskService {
                 block.setProblemtype(problemtype);
                 block.setProblemcomm(problemcomm);
                 block.setProbleid(probleid);
+                block.setStumerge(stumerge);
                 msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
                 block.setMpsid(mpsid);
                 block.setMblockid(param.getMblockid());
@@ -465,6 +467,7 @@ public class MsPaperCheckTeacherTaskService {
                 question.setProblemcomm(problemcomm);
                 question.setProbleid(probleid);
                 question.setStuscore(arbitratescore);
+                question.setStumerge(stumerge);
                 msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
         } else {//双评
@@ -602,6 +605,7 @@ public class MsPaperCheckTeacherTaskService {
                 block.setMpsid(mpsid);
                 block.setMblockid(param.getMblockid());
                 block.setArbitratestate(arbitratestate);
+                block.setStumerge(stumerge);
                 msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
 
                 msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, block);//更新学生单题批阅信息
@@ -626,6 +630,7 @@ public class MsPaperCheckTeacherTaskService {
                 question.setStuscore(endscore);
                 question.setMpsqid(mpsbid);
                 question.setArbitratestate(arbitratestate);
+                question.setStumerge(stumerge);
                 msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
         }

smarking/src/main/java/com/xhkjedu/smarking/service/report/reportother/MsrExamService.java

@@ -2,6 +2,8 @@ package com.xhkjedu.smarking.service.report.reportother;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.exam.*;
+import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectMapper;
+import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassTopMapper;
 import com.xhkjedu.smarking.mapper.report.reportother.MsrExamMapper;
 import com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper;
 import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentMapper;
@@ -10,12 +12,15 @@ import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectMapper;
 import com.xhkjedu.smarking.mapper.stupaper.MsPaperStudentMapper;
 import com.xhkjedu.smarking.model.exam.*;
 import com.xhkjedu.smarking.model.paper.MsPaper;
+import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubject;
+import com.xhkjedu.smarking.model.report.reportclass.MsrClassTop;
 import com.xhkjedu.smarking.model.report.reportother.MsrExam;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectClass;
 import com.xhkjedu.smarking.utils.MarkingUtil;
+import com.xhkjedu.smarking.vo.report.reportclass.ClassTopVo;
 import com.xhkjedu.smarking.vo.report.reportother.StuRankVo;
 import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
 import com.xhkjedu.utils.N_Utils;
@@ -52,6 +57,11 @@ public class MsrExamService {
     private MsrReportparamMapper msrReportparamMapper;
     @Resource
     private MsrSubjectClassMapper msrSubjectClassMapper;
+    @Resource
+    private MsrClassSubjectMapper msrClassSubjectMapper;
+    @Resource
+    private MsrClassTopMapper msrClassTopMapper;
+
 
     /**
      * @Description 生成报告
@@ -248,14 +258,28 @@ public class MsrExamService {
         msrStudents.addAll(classSubjectStudents);
         if (N_Utils.isListNotEmpty(msrStudents)) msrStudentMapper.insertList(msrStudents);
 
-        //科目班级分数分布区间分析
+        //科目班级分数分布区间分析、班级学科分析
         //区间参数
-        List<MsrReportparam> qjParams = msrReportparamMapper.listReportparamByRpbelong(examid, "scoresection", "");
+        List<MsrReportparam> qjParams = msrReportparamMapper.listReportparamByRpbelong(examid, "scoresection", "xk");
         Map<String, List<SzJsonVo>> qjMap = new HashMap<>();
         for (MsrReportparam param : qjParams) {
             qjMap.put(param.getSubjectid(), JSON.parseArray(param.getSzjson(), SzJsonVo.class));
         }
-        List<MsrSubjectClass> msrSubjectClasses = new ArrayList<>();
+        List<MsrSubjectClass> msrSubjectClasses = new ArrayList<>();//科目班级分数分布区间分析
+        List<MsrClassSubject> msrClassSubjects = new ArrayList<>();//班级学科分析
+        List<MsrClassTop> msrClassTops = new ArrayList<>();//班级学科前60分析
+        Map<String, ClassTopVo> lsMap = new HashMap<>();//处于年级60%得分map
+        for (MsrSubject subject : msrSubjects) {
+            Double lsscore = subject.getLsscore();
+            String subjectid1 = subject.getSubjectid();
+            List<MsrStudent> lsstudents = msrStudents.stream().filter(s -> s.getSubjectid().equals(subjectid1) && s.getStuscore().compareTo(lsscore) >= 0).collect(Collectors.toList());
+            ClassTopVo classTopVo = new ClassTopVo();
+            classTopVo.setSubjectid(subjectid1);
+            classTopVo.setLsscore(lsscore);
+            classTopVo.setXtnum(lsstudents.size());
+            double average = lsstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage();
+            classTopVo.setXtavgscore(N_Utils.formatDouble(average, 2));
+        }
         Map<String, List<MsrStudent>> scCollect = msrStudents.stream().collect(Collectors.groupingBy(s -> s.getClassid() + "_" + s.getSubjectid()));
         for (Map.Entry<String, List<MsrStudent>> entry : scCollect.entrySet()) {
             String key = entry.getKey();
@@ -263,17 +287,62 @@ public class MsrExamService {
             subjectid = key.split("_")[1];
             List<SzJsonVo> list = qjMap.get(subjectid);
             List<MsrStudent> studentList = entry.getValue();
-            for (SzJsonVo vo : list) {
-                Object djvalue = vo.getDjvalue();
+            totalnum = studentList.size();//区间总人数
+            Double fullscore1 = studentList.get(0).getFullscore();
+            List<int[]> fdScore = MarkingUtil.fdScore(fullscore1, N_Utils.obj2Int(list.get(0).getDjvalue()));
+            for (int[] scores : fdScore) {
+                int minscore = scores[0];
+                int maxscore = scores[1];
+                String qjname = "[" + minscore + "," + maxscore;
+                double min = MarkingUtil.objToDouble(minscore);
+                double max = MarkingUtil.objToDouble(maxscore);
+                List<MsrStudent> qjstudents;
+                if (fullscore1.compareTo(max) == 0) {
+                    qjname += "]";
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(min) >= 0).collect(Collectors.toList());
+                } else {
+                    qjname += ")";
+                    qjstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(min) >= 0 && s.getStuscore().compareTo(max) < 0).collect(Collectors.toList());
+                }
+                int qjnum = qjstudents.size();
                 MsrSubjectClass msrSubjectClass = new MsrSubjectClass();
                 msrSubjectClass.setExamid(examid);
-                msrSubjectClass.setClassid(classid);
                 msrSubjectClass.setSubjectid(subjectid);
-                msrSubjectClass.setQjname(vo.getDjkey());
+                msrSubjectClass.setClassid(classid);
+                msrSubjectClass.setQjname(qjname);
+                msrSubjectClass.setQjnum(qjnum);
+                msrSubjectClass.setQjrate(N_Utils.getIntegerDivideAndMulitiply(qjnum, totalnum));
+                double qjavg = qjstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage();
+                msrSubjectClass.setQjavgrate(N_Utils.getDoubleDivideAndMulitiply(qjavg, fullscore1));
                 msrSubjectClasses.add(msrSubjectClass);
             }
+
+            MsrClassSubject msrClassSubject = new MsrClassSubject();
+            msrClassSubject.setExamid(examid);
+            msrClassSubject.setSubjectid(subjectid);
+            msrClassSubject.setClassid(classid);
+            msrClassSubject.setFullscore(fullscore1);
+            msrClassSubjects.add(msrClassSubject);
+
+            MsrClassTop msrClassTop = new MsrClassTop();
+            msrClassTop.setExamid(examid);
+            msrClassTop.setClassid(classid);
+            msrClassTop.setSubjectid(subjectid);
+            msrClassTop.setStunum(totalnum);
+            ClassTopVo classTopVo = lsMap.get(subjectid);//处于年级60%得分
+            Double lsscore = classTopVo.getLsscore();
+            List<MsrStudent> lsstudents = studentList.stream().filter(s -> s.getStuscore().compareTo(lsscore) >= 0).collect(Collectors.toList());
+            msrClassTop.setBtnum(lsstudents.size());
+            msrClassTop.setBtrate(N_Utils.getIntegerDivideAndMulitiply(msrClassTop.getBtnum(), totalnum));
+            double average = lsstudents.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics().getAverage();
+            msrClassTop.setBtavgscore(N_Utils.formatDouble(average, 2));
+            msrClassTop.setXtnum(classTopVo.getXtnum());
+            msrClassTop.setXtavgscore(classTopVo.getXtavgscore());
+            msrClassTops.add(msrClassTop);
         }
         msrSubjectClassMapper.insertList(msrSubjectClasses);
+        msrClassSubjectMapper.insertList(msrClassSubjects);
+        msrClassTopMapper.insertList(msrClassTops);
 
         examMapper.updateExamState(examid, 3);
     }

smarking/src/main/java/com/xhkjedu/smarking/vo/papercheck/MsPaperCheckVo.java

@@ -81,4 +81,6 @@ public class MsPaperCheckVo {
     private Integer finalreason;
     //题块试题列表
     private List<MsPaperBlockQuestion> questions;
+    //学生批改后图片
+    private String stumerge;
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportclass/ClassTopVo.java

@@ -0,0 +1,20 @@
+package com.xhkjedu.smarking.vo.report.reportclass;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author ywx
+ * Date 2024/12/13 10:35
+ **/
+@Data
+public class ClassTopVo {
+    //科目ID（含总分）
+    private String subjectid;
+    //处于年级60%得分
+    private Double lsscore;
+    //校级前60%人数
+    private Integer xtnum;
+    //校前60%人数平均分
+    private Double xtavgscore;
+}

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

@@ -88,14 +88,14 @@
     <!--获取待仲裁任务-->
     <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}))
@@ -120,14 +120,14 @@
     <!--教师阅卷-待仲裁-上一份-->
     <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
@@ -176,13 +176,13 @@
     <!--学科组长-获取待仲裁任务-->
     <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
@@ -201,7 +201,7 @@
     </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

@@ -68,7 +68,7 @@
     </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>
@@ -110,7 +110,7 @@
     </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
@@ -140,7 +140,7 @@
     </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

@@ -377,7 +377,7 @@
     <!--教师阅卷-按题块-获取待批试题-->
     <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
@@ -387,7 +387,7 @@
             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
@@ -513,7 +513,7 @@
     <!--教师阅卷-按试题-获取待批试题-->
     <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
@@ -523,7 +523,7 @@
             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
@@ -559,7 +559,7 @@
     <!--教师阅卷-按班级-获取待批试题-->
     <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
@@ -569,7 +569,7 @@
             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
@@ -618,7 +618,7 @@
     </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>
@@ -657,7 +657,7 @@
     </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>

smarking/src/main/resources/mapper/stupaper/MsPaperStudentQuestionMapper.xml

@@ -208,6 +208,9 @@
         <if test="block.checked!=null and block.checked!=0">
             ,checked=#{block.checked}
         </if>
+        <if test="block.stumerge!=null and block.stumerge!=''">
+            ,stumerge=#{block.stumerge}
+        </if>
         where mblockid=#{block.mblockid} and mpsid=#{block.mpsid} and mptqid in
         <foreach collection="list" item="q" separator="," open="(" close=")">#{q.mptqid}</foreach>
     </update>