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

smarking/src/main/java/com/xhkjedu/smarking/model/papercheck/MsPaperCheck.java

@@ -27,6 +27,8 @@ public class MsPaperCheck extends BaseBean {
     private Integer checktype;
     //仲裁教师ID
     private Integer arbitrateid;
+    //仲裁分差
+    private Double diffscore;
     //是否隐藏初评分0否1是
     private Integer hidefirstscore;
     //分差计算方式1题块总分值2任一给分点

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

@@ -45,12 +45,16 @@ public class MsPaperStudentBlock extends BaseBean {
     private Integer firstcime;
     //单评批改分值
     private Double firstccore;
+    //单评批改分值数组
+    private String firstccores;
     //复评批改人
     private Integer secondcid;
     //复评批改时间
     private Integer secondctime;
     //复评批改分值
     private Double secondcscore;
+    //复评批改分值数组
+    private String secondcscores;
     //仲裁人
     private Integer arbitrateid;
     //仲裁时间

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description 阅卷批阅教师任务表 服务实现类
@@ -311,11 +312,11 @@ public class MsPaperCheckTeacherTaskService {
         Double qscore = param.getQscore();
         List<MsPaperBlockQuestion> questions = param.getQuestions();
         int checked = 1;
+        Double firstccore = param.getFirstccore();
         if (checktype.equals(1)) {//单评
             if (hasproblem.equals(0)) {
                 checked = 2;
             }
-            Double firstccore = param.getFirstccore();
             if (correcttype.equals(3)) {//按题块批阅
                 //题块批阅信息
                 MsPaperStudentBlock block = new MsPaperStudentBlock();
@@ -375,9 +376,172 @@ public class MsPaperCheckTeacherTaskService {
                 question.setHasproblem(hasproblem);
                 question.setProblemtype(problemtype);
                 question.setProblemcomm(problemcomm);
+                question.setStuscore(firstccore);
                 msPaperStudentQuestionMapper.updateByPrimaryKeySelective(question);
             }
+        } else {//双评
+            Integer handleid = param.getHandleid();
+            Integer firstcid = param.getFirstcid();
+            Integer secondcid = param.getSecondcid();
+            Integer firstcime = param.getFirstcime();
+            Integer secondcime = param.getSecondctime();
+            Double secondcscore = param.getSecondcscore();
+            Integer type = param.getChecktype();//批阅情况1一评2二评
+            boolean corrected = false;
+            if ((handleid.equals(firstcid) && N_Utils.isTrueInteger(secondcime))
+                    || (handleid.equals(secondcid) && N_Utils.isTrueInteger(firstcime))) {
+                checked = 2;
+                corrected = true;
+            }
+            Double diffscore = check.getDiffscore();//仲裁分差
+            Integer scoreway = check.getScoreway();//分差计算方式1题块总分值2任一给分点
+            Integer finalscore = check.getFinalscore();//最终得分取值1不取整(保留2位小数) 2取整-向上取值 3取整-向下取值
+            Double roundvalue = check.getRoundvalue();//取整取值间隔
+            Double endscore = null;
+            if (checked == 2) {//分差计算方式为题块总分值
+                double scoreDiff = MarkingUtil.scoreDiff(firstccore, secondcscore);
+                if (scoreway.equals(1) && diffscore.compareTo(scoreDiff) < 0) {//分差大于仲裁分差
+                    hasproblem = 1;
+                    problemtype = 5;
+                    problemcomm = "题块总分值大于仲裁分差";
+                    checked = 1;
+                } else if (scoreway.equals(1)) {
+                    double addScore = MarkingUtil.add(firstccore, secondcscore);
+                    endscore = getUserScore(finalscore, addScore, roundvalue);
+                }
+            }
+            if (correcttype.equals(3)) {//按题块批阅
+                //题块批阅信息
+                MsPaperStudentBlock block = new MsPaperStudentBlock();
+                block.setMpsbid(mpsbid);
+                String stuscores = questions.stream().map(MsPaperBlockQuestion::getMergescore).collect(Collectors.joining(";"));
+                if (type.equals(1)) {
+                    block.setFirstcime(N_Utils.getSecondTimestamp());
+                    block.setFirstccore(firstccore);
+                    block.setFirstccores(stuscores);
+                } else {
+                    block.setSecondctime(N_Utils.getSecondTimestamp());
+                    block.setSecondcscore(secondcscore);
+                    block.setSecondcscores(stuscores);
+                }
+
+                String[] cores;
+                if (type.equals(1)) {
+                    cores = param.getSecondcscores().split(";");
+                } else {
+                    cores = param.getFirstccores().split(";");
+                }
+                List<MsPaperStudentQuestion> studentQuestions = new ArrayList<>();
+                for (int j = 0; j < questions.size(); j++) {
+                    MsPaperBlockQuestion question = questions.get(j);
+                    Double stuscore = question.getStuscore();
+                    if (N_Utils.isTrueInteger(question.getMptqid())) {
+                        MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
+                        studentQuestion.setMptqid(question.getMptqid());
+                        if (type.equals(1)) {
+                            studentQuestion.setFirstccore(stuscore);
+                        } else {
+                            studentQuestion.setSecondcscore(stuscore);
+                        }
+                        if (corrected && hasproblem.equals(0)) {
+                            double scoreDiff = MarkingUtil.scoreDiff(stuscore, cores[j]);
+                            if (scoreway.equals(2) && diffscore.compareTo(scoreDiff) < 0) {//分差大于仲裁分差
+                                hasproblem = 1;
+                                problemtype = 5;
+                                problemcomm = "任一给分点大于仲裁分差";
+                                checked = 1;
+                                corrected = false;
+                            } else if (scoreway.equals(2)) {
+                                double addScore = MarkingUtil.add(stuscore, cores[j]);
+                                endscore = getUserScore(finalscore, addScore, roundvalue);
+                                studentQuestion.setStuscore(endscore);
+                            }
+                        }
+                        studentQuestions.add(studentQuestion);
+                    } else {
+                        String[] mptqids = question.getMergeqid().split(",");
+                        String[] mergescores = question.getMergescore().split(",");
+                        double[] scores = new double[mergescores.length];
+                        int last = mergescores.length - 1;
+                        double score = 0;
+                        for (int i = 0; i < mergescores.length; i++) {
+                            scores[i] = MarkingUtil.mul(MarkingUtil.div(mergescores[i], qscore), stuscore);
+                            score = MarkingUtil.add(score, scores[i]);
+                            if (i == last) {
+                                scores[i] = MarkingUtil.sub(stuscore, score);
+                            }
+                        }
+                        String[] cores2 = cores[j].split(",");
+                        for (int i = 0; i < mptqids.length; i++) {
+                            MsPaperStudentQuestion studentQuestion = new MsPaperStudentQuestion();
+                            studentQuestion.setMptqid(N_Utils.obj2Int(mptqids[i]));
+                            if (type.equals(1)) {
+                                studentQuestion.setFirstccore(scores[i]);
+                            } else {
+                                studentQuestion.setSecondcscore(scores[i]);
+                            }
+                            if (corrected && hasproblem.equals(0)) {
+                                double scoreDiff = MarkingUtil.scoreDiff(scores[i], cores2[i]);
+                                if (scoreway.equals(2) && diffscore.compareTo(scoreDiff) < 0) {//分差大于仲裁分差
+                                    hasproblem = 1;
+                                    problemtype = 5;
+                                    problemcomm = "任一给分点大于仲裁分差";
+                                    checked = 1;
+                                    corrected = false;
+                                } else if (scoreway.equals(2)) {
+                                    double addScore = MarkingUtil.add(scores[i], cores2[i]);
+                                    endscore = getUserScore(finalscore, addScore, roundvalue);
+                                    studentQuestion.setStuscore(endscore);
+                                }
+                            }
+                            studentQuestions.add(studentQuestion);
+                        }
+                    }
+                }
+
+                block.setChecked(checked);
+                block.setHasgood(hasgood);
+                block.setHasbad(hasbad);
+                block.setHasproblem(hasproblem);
+                block.setProblemtype(problemtype);
+                block.setProblemcomm(problemcomm);
+                block.setStudentid(param.getStudentid());
+                block.setMblockid(param.getMblockid());
+                msPaperStudentBlockMapper.updateByPrimaryKeySelective(block);
+
+                msPaperStudentQuestionMapper.checkByMptqidAndStudentId(studentQuestions, block);//更新学生单题批阅信息
+            } else {//按试题批阅
+                MsPaperStudentQuestion question = new MsPaperStudentQuestion();
+                question.setChecked(checked);
+                if (type.equals(1)) {
+                    question.setFirstcime(N_Utils.getSecondTimestamp());
+                    question.setFirstccore(firstccore);
+                } else {
+                    question.setSecondctime(N_Utils.getSecondTimestamp());
+                    question.setSecondcscore(secondcscore);
+                }
+                question.setHasgood(hasgood);
+                question.setHasbad(hasbad);
+                question.setHasproblem(hasproblem);
+                question.setProblemtype(problemtype);
+                question.setProblemcomm(problemcomm);
+                question.setStuscore(endscore);
+                question.setMpsqid(mpsbid);
+            }
         }
         msPaperCheckTeacherTaskMapper.correct(param);
     }
+
+    //最终得分计算
+    private Double getUserScore(Integer finalscore, double addScore, Double roundvalue) {
+        double score;
+        if (finalscore.equals(1)) {
+            score = MarkingUtil.div(addScore, 2);
+        } else if (finalscore.equals(2)) {
+            score = MarkingUtil.roundUp(addScore, roundvalue);
+        } else {
+            score = MarkingUtil.roundDown(addScore, roundvalue);
+        }
+        return score;
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -125,9 +125,9 @@ public class MarkingUtil {
      * @param v2 加数
      * @return 两个参数的和
      */
-    public static double add(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+    public static double add(Object v1, Object v2) {
+        BigDecimal b1 = new BigDecimal(v1.toString());
+        BigDecimal b2 = new BigDecimal(v2.toString());
         return b1.add(b2).doubleValue();
     }
 
@@ -172,6 +172,54 @@ public class MarkingUtil {
         return b1.divide(b2, 2, BigDecimal.ROUND_DOWN).doubleValue();
     }
 
+    /**
+     * 向上取值
+     * @param score 原始得分
+     * @param interval 取值间隔
+     * @return 向上取值后的结果
+     */
+    public static double roundUp(double score, double interval) {
+        return Math.ceil(score / interval) * interval;
+    }
+
+    /**
+     * 向下取值
+     * @param score 原始得分
+     * @param interval 取值间隔
+     * @return 向下取值后的结果
+     */
+    public static double roundDown(double score, double interval) {
+        return Math.floor(score / interval) * interval;
+    }
+
+    /**
+     * 计算总分并处理超过满分的情况
+     * @param scores 得分数组
+     * @param interval 取值间隔
+     * @param maxScore 满分
+     * @return 最终总分
+     */
+    public static double calculateTotalScore(double[] scores, double interval, double maxScore) {
+        double totalScore = 0.0;
+
+        for (double score : scores) {
+            totalScore += roundUp(score, interval);
+        }
+
+        return Math.min(totalScore, maxScore);
+    }
+
+    /**
+     * 计算两个分数之间的分差
+     * @param score1 第一个分数
+     * @param score2 第二个分数
+     * @return 分差
+     */
+    public static double scoreDiff(Object score1, Object score2) {
+        return Math.abs(sub(score1, score2));
+    }
+
+
     /**
      * 提供精确的减法运算。
      *
@@ -179,9 +227,9 @@ public class MarkingUtil {
      * @param v2 减数
      * @return 两个参数的差
      */
-    public static double sub(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+    public static double sub(Object v1, Object v2) {
+        BigDecimal b1 = new BigDecimal(v1.toString());
+        BigDecimal b2 = new BigDecimal(v2.toString());
         return b1.subtract(b2).doubleValue();
     }
 

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

@@ -38,10 +38,14 @@ public class MsPaperCheckVo {
     private Integer firstcime;
     //单评批改分值
     private Double firstccore;
+    //单评批改分值数组
+    private String firstccores;
     //复评批改时间
     private Integer secondctime;
     //复评批改分值
     private Double secondcscore;
+    //复评批改分值数组
+    private String secondcscores;
     //仲裁人
     private Integer arbitrateid;
     //仲裁时间

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

@@ -65,7 +65,7 @@
     </select>
     <!--根据题块id获取阅卷信息-->
     <select id="findByMBlockId" resultType="com.xhkjedu.smarking.model.papercheck.MsPaperCheck">
-        select mpcid,mpid,mblockid,checktype,arbitrateid,hidefirstscore,scoreway,finalscore,roundvalue,dispenseway
+        select mpcid,mpid,mblockid,checktype,arbitrateid,diffscore,hidefirstscore,scoreway,finalscore,roundvalue,dispenseway
         from ms_paper_check where mpid = #{mpid} and mblockid = #{mblockid}
     </select>
     <!--获取学生作答及批阅信息（按题块）-->
@@ -114,6 +114,7 @@
         <result property="qn" column="qn"/>
         <result property="mblockid" column="mblockid"/>
         <result property="mpid" column="mpid"/>
+        <result property="qscore" column="qscore"/>
         <result property="msid" column="msid"/>
         <result property="mpcid" column="mpcid"/>
         <result property="checktype" column="checktype"/>
@@ -122,7 +123,7 @@
         <collection property="teachers" select="listCheckTeacher" column="mblockid"/>
     </resultMap>
     <select id="listQuestion" resultMap="questionResultMap">
-        select q.qorder,q.qn,q.mptqid as mblockid,q.mpid,p.msid,pc.mpcid,pc.checktype,pc.dispenseway
+        select q.qorder,q.qn,q.mptqid as mblockid,q.mpid,q.qscore,p.msid,pc.mpcid,pc.checktype,pc.dispenseway
         ,if(pc.checktype=2,(select u.username from t_user u where u.userid=pc.arbitrateid),'') as arbitratename
         from ms_paper_qtype_question q left join ms_paper_check pc on q.mpid=pc.mpid
         inner join ms_paper p on q.mpid=p.mpid

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

@@ -255,14 +255,17 @@
         <if test="param.dispenseway!=null and param.dispenseway!=2">
             select pctt.mblockid,pctt.mpsbid,pctt.checktype,psb.stuanswer,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.studentid
+            ,psb.firstccore,psb.secondcscore,psb.firstccores,psb.secondcscores
             from ms_paper_student_block psb inner join ms_paper_check_teacher_task pctt on psb.mpsbid = pctt.mpsbid and psb.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
+            and pctt.checkstate!=3 and psb.hasproblem=0
             order by field(pctt.checkstate,2,1,3),pctt.taskorder
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
             select psb.mblockid,psb.mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.studentid
+            ,psb.firstccore,psb.secondcscore,psb.firstccores,psb.secondcscores
             from ms_paper_student_block psb
             where psb.mpid=#{param.mpid} and psb.mblockid = #{param.mblockid}
             and (psb.checked=0 or (psb.checked=1 and (psb.firstcid=#{param.teacherid}
@@ -270,6 +273,7 @@
                 or psb.secondcid=#{param.teacherid}
             </if>
             )))
+            and psb.hasproblem=0
             order by field(psb.checked,1,0,2)
             limit 1
         </if>
@@ -342,14 +346,17 @@
         <if test="param.dispenseway!=null and param.dispenseway!=2">
             select pctt.mblockid,pctt.mpsbid,pctt.checktype,psb.stuanswer,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            ,psb.firstccore,psb.secondcscore
             from ms_paper_student_question psb inner join ms_paper_check_teacher_task pctt on psb.mpsqid = pctt.mpsbid and psb.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
+            and pctt.checkstate!=3 and psb.hasproblem=0
             order by field(pctt.checkstate,2,1,3),pctt.taskorder
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
             select psb.mptqid as mblockid,psb.mpsqid as mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime
+            ,psb.firstccore,psb.secondcscore
             from ms_paper_student_question psb
             where psb.mpid=#{param.mpid} and psb.mptqid = #{param.mblockid}
             and (psb.checked=0 or (psb.checked=1 and (psb.firstcid=#{param.teacherid}
@@ -357,6 +364,7 @@
                 or psb.secondcid=#{param.teacherid}
             </if>
             )))
+            and psb.hasproblem=0
             order by field(psb.checked,1,0,2)
             limit 1
         </if>
@@ -376,14 +384,17 @@
         <if test="param.dispenseway!=null and param.dispenseway!=2">
             select pctt.mblockid,pctt.mpsbid,pctt.checktype,psb.stuanswer,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.mptqid
+            ,psb.firstccore,psb.secondcscore
             from ms_paper_student_question psb inner join ms_paper_check_teacher_task pctt on psb.mpsqid = pctt.mpsbid and psb.mpid=pctt.mpid
             where pctt.mpid=#{param.mpid} and pctt.mblockid = #{param.mblockid} and pctt.teacherid = #{param.teacherid}
+            and pctt.checkstate!=3 and psb.hasproblem=0
             order by field(pctt.checkstate,2,1,3),pctt.taskorder
             limit 1
         </if>
         <if test="param.dispenseway!=null and param.dispenseway==2">
             select c.classid as mblockid,psb.mpsqid as mpsbid,psb.answertype,psb.stuanswer,psb.qscore,psb.checked
             ,psb.firstcid,psb.firstcime,psb.secondcid,psb.secondctime,psb.mptqid
+            ,psb.firstccore,psb.secondcscore
             from ms_paper_student_question psb inner join ms_class c on psb.mpid=c.mpid
             where psb.mpid=#{param.mpid} and c.classid = #{param.mblockid}
             and (psb.checked=0 or (psb.checked=1 and (psb.firstcid=#{param.teacherid}
@@ -391,6 +402,7 @@
                 or psb.secondcid=#{param.teacherid}
             </if>
             )))
+            and psb.hasproblem=0
             order by field(psb.checked,1,0,2),psb.mptqid
             limit 1
         </if>

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

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