校验信息

src/main/java/com/xhkjedu/mapper/EPaperVerifyMapper.java

@@ -1,7 +1,9 @@
 package com.xhkjedu.mapper;
 
 import com.xhkjedu.model.EPaperQtypeQuestion;
+import com.xhkjedu.model.EPaperStudent;
 import com.xhkjedu.model.EPaperStudent0608;
+import com.xhkjedu.model.EPaperStudentQuestion;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -27,4 +29,16 @@ public interface EPaperVerifyMapper {
 
     //获取试卷原试题答案
     List<EPaperQtypeQuestion> listPaperAnswer(@Param("epid") Integer epid);
+
+    //批量修改学生试题
+    void updateBatchStuQuestion(@Param("list")List<EPaperStudentQuestion> list);
+
+    //修改学生试卷状态
+    void updateStuPaper(@Param("p")EPaperStudent p);
+
+    //修改单独试卷审核状态
+    void updateStuPaperVerified(@Param("p")EPaperStudent p);
+
+    //修改新表试卷状态
+    void updateStuPaper0608(@Param("p")EPaperStudent0608 p);
 }

src/main/java/com/xhkjedu/service/EPaperVerifyService.java

@@ -1,10 +1,18 @@
 package com.xhkjedu.service;
 
+import com.alibaba.fastjson2.JSON;
 import com.xhkjedu.mapper.EPaperVerifyMapper;
+import com.xhkjedu.model.EPaperQtypeQuestion;
+import com.xhkjedu.model.EPaperStudent;
 import com.xhkjedu.model.EPaperStudent0608;
+import com.xhkjedu.model.EPaperStudentQuestion;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.PaperStudentParams;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -34,8 +42,164 @@ public class EPaperVerifyService {
         ePaperVerifyMapper.correctSkip(epsid);
     }
 
-    public void correctSave(){
+    //识别确认
+    @Transactional(rollbackFor = Exception.class)
+    public void correctSave(PaperStudentParams psParams){
+        Integer epid = psParams.getEpid();
+        Integer studentid = psParams.getStudentid();
 
+        //是否验证0待验证1验证通过2验证不通过
+        if(psParams.getVerified() == 2){
+            EPaperStudent paperStudent = new EPaperStudent();
+            paperStudent.setEpid(epid);
+            paperStudent.setStudentid(studentid);
+            paperStudent.setVerified(2);
+            ePaperVerifyMapper.updateStuPaperVerified(paperStudent);
+
+            //验证不通过，更改状态
+            EPaperStudent0608 ps0608 = new EPaperStudent0608();
+            ps0608.setEpid(epid);
+            ps0608.setStudentid(studentid);
+            ps0608.setVerified(2);
+            ps0608.setSamed(0);
+            ePaperVerifyMapper.updateStuPaper0608(ps0608);
+        }else{
+            //获取原试卷答案，
+            List<EPaperQtypeQuestion> questions = ePaperVerifyMapper.listPaperAnswer(psParams.getEpid());
+            List<EPaperStudentQuestion> stuQues = psParams.getQuestions();
+
+            Double paperscore = 0D;//学生试卷得分
+
+            for(EPaperStudentQuestion psq : stuQues){
+                EPaperQtypeQuestion pqtypeQues = questions.stream().filter(a -> a.getEptqid().equals(psq.getEptqid())).findFirst().orElse(null);
+                setCommitQuestion(psq,pqtypeQues);
+
+                paperscore = N_Utils.add(paperscore, psq.getStuscore());
+                psq.setStudentid(studentid);
+                psq.setEpid(epid);
+            }
+            ePaperVerifyMapper.updateBatchStuQuestion(stuQues);
+
+            EPaperStudent paperStudent = new EPaperStudent();
+            paperStudent.setEpid(epid);
+            paperStudent.setStudentid(studentid);
+            paperStudent.setStuscore(paperscore);
+            paperStudent.setStupic(psParams.getStupic());
+            paperStudent.setPagenum(psParams.getPagenum());
+            paperStudent.setSstate(2);
+            paperStudent.setChecked(2);
+            paperStudent.setVerified(1);
+            ePaperVerifyMapper.updateStuPaper(paperStudent);
+
+            EPaperStudent0608 ps0608 = new EPaperStudent0608();
+            ps0608.setEpid(epid);
+            ps0608.setStudentid(studentid);
+            ps0608.setVerified(1);
+            ps0608.setSamed(psParams.getSamed());
+            ePaperVerifyMapper.updateStuPaper0608(ps0608);
+        }
+
+
+
+    }
+
+    //判断单道题情况
+    private void setCommitQuestion(EPaperStudentQuestion psq, EPaperQtypeQuestion answerVo) {
+        int timestamp = N_Utils.getSecondTimestamp();
+        psq.setAnswertime(timestamp);
+        int coverted = 1;//是否转换0未转换1已转换2转换失败
+        String stuanswer = psq.getStuanswer();
+        String stuanswertxt = psq.getStuanswertxt();
+        Double stuscore = 0D;
+        if (N_Utils.isEmpty(stuanswer) && N_Utils.isEmpty(stuanswertxt)
+                && N_Utils.isListEmpty(JSON.parseArray(stuanswer, String.class))
+                && N_Utils.isListEmpty(JSON.parseArray(stuanswertxt, String.class))) {
+            psq.setAnswered(0);
+            psq.setStuanswer(null);
+            psq.setStuanswertxt(null);
+            psq.setStuscore(stuscore);
+            psq.setChecked(2);
+            psq.setChecktime(timestamp);
+            psq.setAnswered(0);
+        } else {
+            List<String> stuanswers = JSON.parseArray(stuanswer, String.class);
+            String qanswer = answerVo.getAnswer();
+            List<String> qanswers = JSON.parseArray(qanswer, String.class);
+            int ctype = answerVo.getCtype();
+            if (psq.getAnswertype() == 1) {
+                if (N_Utils.isObjectiveQuestion(ctype)) {
+                    //客观题进行批阅
+                    if (ctype == 1 || ctype == 4 || ctype == 5 || ctype == 6) {
+                        //单选、判断
+                        if (stuanswer.equalsIgnoreCase(qanswer)) {
+                            stuscore = answerVo.getScore();
+                        }
+                    } else if (ctype == 2) {//多选
+                        //多选、选错不得分
+                        if (stuanswers.get(0).length() <= qanswer.length()) {
+                            String[] qanswerList = qanswers.get(0).split("");
+                            String[] stuanswerList = stuanswers.get(0).split("");
+                            int rightNum = 0;//选对个数
+                            for (String sa : stuanswerList) {
+                                int right = 0;
+                                for (String qa : qanswerList) {
+                                    if (qa.equals(sa)) {
+                                        right = 1;
+                                        rightNum++;
+                                    }
+                                }
+                                if (right == 0) {//说明选错
+                                    rightNum = 0;
+                                    break;
+                                }
+                            }
+                            if (rightNum > 0) {
+                                if (qanswerList.length == rightNum) {
+                                    //全选对
+                                    stuscore = answerVo.getScore();
+                                } else if (qanswerList.length > rightNum) {
+                                    //少选得半分
+                                    stuscore = N_Utils.div(answerVo.getScore(), 2, 1);
+                                }
+                            }
+                        }
+                    }
+
+                    psq.setChecked(2);
+                    psq.setChecktime(timestamp);
+                } else {
+                    if (stuanswers.size() > 1) {
+                        coverted = 0;//上传的多张图片设为0未转换
+                    }
+                    psq.setChecked(0);
+                }
+            } else {
+                if(N_Utils.isNotEmpty(stuanswertxt)){
+                    List<String> stuanswertxt_list = JSON.parseArray(stuanswertxt,String.class);
+                    String stuanswertxt_txt = stuanswertxt_list.get(0);
+                    if(N_Utils.isNotEmpty(stuanswertxt_txt)){
+                        stuanswertxt_txt = N_Utils.strTrim(stuanswertxt_txt);
+                        if(N_Utils.isNotEmpty(stuanswertxt_txt)){
+                            psq.setChecked(0);
+                            List<String> stuanswertxt_list_new = new ArrayList<>();
+                            stuanswertxt_list_new.add(stuanswertxt_txt);
+                            psq.setStuanswertxt(JSON.toJSONString(stuanswertxt_list_new));
+                        }else{
+                            psq.setChecked(2);
+                            psq.setStuanswertxt("[\"\"]");
+                        }
+                    }else{
+                        psq.setChecked(2);
+                        psq.setStuanswertxt("[\"\"]");
+                    }
+                }else{
+                    psq.setChecked(2);
+                }
+            }
+            psq.setStuscore(stuscore);
+        }
+
+        psq.setConverted(coverted);
     }
 
 

src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -4,14 +4,8 @@ import com.xhkjedu.exception.MissingParametersException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.net.URL;
-import java.net.URLConnection;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -721,259 +715,10 @@ public class N_Utils {
         return map;//返回包含数字及其对应百分比的哈希映射
     }
 
-    /**
-     * 格式化百分比
-     * @Param [arr]
-     * @Author ywx
-     * @Date 2020/10/12 11:58
-     * @return double[]
-     **/
-    public static double[] getPercentValue(int[] arr){
-        //求和
-        double sum = 0;
-        if(sum <= 0){
-            for (int i = 0; i < arr.length; i++) {
-                sum += arr[i];
-            }
-        }
-        //10的2次幂是100，用于计算精度。
-        double digits = 1;
-        //扩大比例100
-        double[] votesPerQuota = new double[arr.length];
-        for(int i = 0; i < arr.length; i++){
-            double val = arr[i] / sum * digits * 100;
-            votesPerQuota[i] = val;
-        }
-        //总数,扩大比例意味的总数要扩大
-        double targetSeats = digits * 100;
-        //再向下取值，组成数组
-        double[] seats = new double[arr.length];
-        for(int i = 0; i < votesPerQuota.length; i++){
-            seats[i] = Math.floor(votesPerQuota[i]);
-        }
-        //再新计算合计，用于判断与总数量是否相同,相同则占比会100%
-        double currentSum = 0;
-        for (int i = 0; i < seats.length; i++) {
-            currentSum += seats[i];
-        }
-        //余数部分的数组:原先数组减去向下取值的数组,得到余数部分的数组
-        double[] remainder = new double[arr.length];
-        for(int i = 0; i < seats.length; i++){
-            remainder[i] = votesPerQuota[i] - seats[i];
-        }
-        while(currentSum < targetSeats){
-            double max = 0;
-            int maxId = 0;
-            for(int i = 0;i < remainder.length;++i){
-                if(remainder[i] > max){
-                    max = remainder[i];
-                    maxId = i;
-                }
-            }
-            //对最大项余额加1
-            ++seats[maxId];
-            //已经增加最大余数加1,则下次判断就可以不需要再判断这个余额数。
-            remainder[maxId] = 0;
-            //总的也要加1,为了判断是否总数是否相同,跳出循环。
-            ++currentSum;
-        }
-        // 这时候的seats就会总数占比会100%
-        return seats;
-    }
-
-    /**
-     *功能描述 字符串是否包含中文
-     * @author WN
-     * @date 2020/11/21
-     * @param  * @param str 待校验字符串
-     * @return true 包含中文字符 false 不包含中文字符
-     */
-    public static boolean isContainChinese(String str){
-        Pattern p = Pattern.compile("[\u4E00-\u9FA5|\\！|\\，|\\。|\\（|\\）|\\《|\\》|\\“|\\”|\\？|\\：|\\；|\\【|\\】]");
-        Matcher m = p.matcher(str);
-        if(m.find()){
-            return true;
-        }
-        return false;
-
-    }
-
-
-    /**
-     * 随机生成4位随机码
-     * @Param []
-     * @Author ywx
-     * @Date 2020/5/8 9:29
-     * @return java.lang.Integer
-     **/
-    public static Integer messageCode(){
-        return (int) ((Math.random()*9+1)*1000);
-    }
-
-    /**
-     * 向指定 URL 发送POST方法的请求
-     * @param url   发送请求的 URL
-     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
-     * @return 所代表远程资源的响应结果
-     */
-    public static String sendPost(String url, String param) {
-        OutputStreamWriter out = null;
-        BufferedReader in = null;
-        String result = "";
-        try {
-            URL realUrl = new URL(url);
-            // 打开和URL之间的连接
-            URLConnection conn = realUrl.openConnection();
-            // 设置通用的请求属性
-            conn.setRequestProperty("accept", "application/x-www-form-urlencoded");
-            conn.setRequestProperty("connection", "Keep-Alive");
-            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
-            // 发送POST请求必须设置如下两行
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-            //设置请求编码格式
-            conn.setRequestProperty("Accept-Charset", "UTF-8");
-            // 文件流编码设置
-            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
-            out.write(param);
-            // flush输出流的缓冲
-            out.flush();
-            // 定义BufferedReader输入流来读取URL的响应
-            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
-            String line;
-            while ((line = in.readLine()) != null) {
-                result += line;
-            }
-        } catch (Exception e) {
-            log.error("发送 POST 请求出现异常！" + e.getMessage());
-        }
-        // 使用finally块来关闭输出流、输入流
-        finally {
-            try {
-                if (out != null) {
-                    out.close();
-                }
-                if (in != null) {
-                    in.close();
-                }
-            } catch (IOException ex) {
-                log.error("关闭输入输出流异常", ex.getMessage());
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 向指定 URL 发送POST方法的请求
-     * @Param [url, param]
-     * @Author ywx
-     * @Date 2021/5/6 16:01
-     * @return java.lang.String
-     **/
-    public static String sendJsonPost(String url, String param) {
-        OutputStreamWriter out = null;
-        BufferedReader in = null;
-        String result = "";
-        try {
-            URL realUrl = new URL(url);
-            // 打开和URL之间的连接
-            URLConnection conn = realUrl.openConnection();
-            // 设置通用的请求属性
-            conn.setRequestProperty("accept", "application/json");
-            conn.setRequestProperty("Content-Type","application/json;charset=UTF-8");
-            conn.setRequestProperty("connection", "Keep-Alive");
-            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
-            // 发送POST请求必须设置如下两行
-            conn.setDoOutput(true);
-            conn.setDoInput(true);
-            //设置请求编码格式
-            conn.setRequestProperty("Accept-Charset", "UTF-8");
-            // 文件流编码设置
-            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
-            out.write(param);
-            // flush输出流的缓冲
-            out.flush();
-            // 定义BufferedReader输入流来读取URL的响应
-            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
-            String line;
-            while ((line = in.readLine()) != null) {
-                result += line;
-            }
-        } catch (Exception e) {
-            System.out.println("发送 POST 请求出现异常！" + e.getMessage());
-        }
-        // 使用finally块来关闭输出流、输入流
-        finally {
-            try {
-                if (out != null) {
-                    out.close();
-                }
-                if (in != null) {
-                    in.close();
-                }
-            } catch (IOException ex) {
-                System.out.println("关闭输入输出流异常" + ex.getMessage());
-            }
-        }
-        return result;
-    }
-
-    /**
-     * 发送form-data请求返回json结果
-     * @Param [apiUrl, param]
-     * @Author ywx
-     * @Date 2021/5/14 17:41
-     * @return java.lang.String
-     **/
-    /*public static String sendFormData(String apiUrl, MultiValueMap<String, String> param) {
-        try {
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-            List<MediaType> acceptableMediaTypes = new ArrayList<>();
-            acceptableMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
-            acceptableMediaTypes.add(MediaType.APPLICATION_PROBLEM_JSON_UTF8);
-            HttpEntity<MultiValueMap<String, String>> requestParams = new HttpEntity<>(param, headers);
-            ResponseEntity<String> response = new RestTemplate().postForEntity(apiUrl, requestParams, String.class);
-            String result = response.getBody();
-            return result;
-        } catch (RestClientException e) {
-            log.error("发送form-data请求失败",e.getMessage());
-            return null;
-        }
-    }*/
-
     static String CHN_NUMBER[] = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" };
     static String CHN_UNIT[] = { "", "十", "百", "千" }; // 权位
     static String CHN_UNIT_SECTION[] = { "", "万", "亿", "万亿" }; // 节权位
 
-    /**
-     * 阿拉伯数字转换为中文数字的核心算法实现。
-     * @return
-     */
-    public static String NumberToChn(int num) {
-        StringBuffer returnStr = new StringBuffer();
-        Boolean needZero = false;
-        int pos = 0; // 节权位的位置
-        if (num == 0) {
-            // 如果num为0，进行特殊处理。
-            returnStr.insert(0, CHN_NUMBER[0]);
-        }
-        while (num > 0) {
-            int section = num % 10000;
-            if (needZero) {
-                returnStr.insert(0, CHN_NUMBER[0]);
-            }
-            String sectionToChn = SectionNumToChn(section);
-            // 判断是否需要节权位
-            sectionToChn += (section != 0) ? CHN_UNIT_SECTION[pos] : CHN_UNIT_SECTION[0];
-            returnStr.insert(0, sectionToChn);
-            needZero = ((section < 1000 && section > 0) ? true : false); // 判断section中的千位上是不是为零，若为零应该添加一个零。
-            pos++;
-            num = num / 10000;
-        }
-        return returnStr.toString().replace("一十", "十");
-    }
-
     /**
      * 将四位的section转换为中文数字
      *
@@ -1006,39 +751,6 @@ public class N_Utils {
         return returnStr.toString();
     }
 
-    /**
-     * 字符串是否包含在集合中的字符串集合
-     * @Param [num, nums]
-     * @Author ywx
-     * @Date 2020/12/24 14:10
-     * @return boolean
-     **/
-    public static boolean strInList(String num,List<String> nums){
-        if (nums.contains(num)){
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    //计算比例
-    public static String getFs(int a, int b){  // 设置分子和分母
-        int numerator;  // 分子
-        int denominator; // 分母
-        if(a == 0 || b == 0){
-            numerator = a;
-            denominator = b;
-        }else{
-            int c = f(Math.abs(a),Math.abs(b));         // 计算最大公约数
-            numerator = a / c;
-            denominator = b / c;
-            if(numerator<0 && denominator<0){
-                numerator = - numerator;
-                denominator = - denominator;
-            }
-        }
-        return numerator + ":" + denominator;
-    }
 
     static int f(int a,int b){  // 求a和b的最大公约数
         if(a < b){
@@ -1055,24 +767,7 @@ public class N_Utils {
         return b;
     }
 
-    //求一个数组的最大公约数
-    public static int getArrMaxGys(int nums[]){
-        int a=nums[0];int b=nums[1];int i=0;
-        int temp;
-        if(a<b){
-            temp = a;
-            a = b;
-            b = temp;
-            temp = a % b;
-            while (temp != 0) {
-                a = b;
-                b = temp;
-                temp = a % b;
-            }
-            nums[i + 1] = b;
-        }
-        return nums[nums.length - 1];
-    }
+
 
     //处理题型中客观题1选择题2多选题456判断7完型填空全选择（弃用）8阅读理解全选择（弃用）10任务行阅读券选择（弃用）16完型填空复合17任务型阅读复合
     private static int[] octypelist = new int[]{1,2,4,5,6,7,8,10,16,17};
@@ -1100,125 +795,38 @@ public class N_Utils {
         }
     }
 
-    //处理题型中复合题
-    private static int[] cctypelist = new int[]{11,16,17};
-    /*
-     * 判断ctype是否是复合题
-     * @Param [ctype]
-     * @Author ywx
-     * @Date 2022/10/18 19:11
-     * @return boolean
-     **/
-    public static boolean isComplexQuestion(Integer ctype){
-        if(ctype != null && ctype != 0){
-            return IntStream.of(cctypelist).anyMatch(x -> x == ctype);
-        }else{
-            return false;
-        }
-    }
-
-    /*
-    * @Description 年级集合(导入时根据名次获取对应数字)
-    * @Author WN
-    * @Date 2023/4/11 10:07
-    */
-    public static Map<String, Integer> listGrade() {
-        Map m = new HashMap();
-        m.put("一年级", 1);
-        m.put("二年级", 2);
-        m.put("三年级", 3);
-        m.put("四年级", 4);
-        m.put("五年级", 5);
-        m.put("六年级", 6);
-        m.put("七年级", 7);
-        m.put("八年级", 8);
-        m.put("九年级", 9);
-        m.put("高一", 10);
-        m.put("高二", 11);
-        m.put("高三", 12);
-        return m;
-    }
-
-    /*
-    * @Description 根据年级id获取年级名次
-    * @Author WN
-    * @Date 2023/4/11 10:07
-    */
-    public static String getGradeName(Integer gradeid){
-        Map gradeMap = new HashMap();
-        gradeMap.put(1, "一年级");
-        gradeMap.put(2, "二年级");
-        gradeMap.put(3, "三年级");
-        gradeMap.put(4, "四年级");
-        gradeMap.put(5, "五年级");
-        gradeMap.put(6, "六年级");
-        gradeMap.put(7, "七年级");
-        gradeMap.put(8, "八年级");
-        gradeMap.put(9, "九年级");
-        gradeMap.put(10, "高一");
-        gradeMap.put(11, "高二");
-        gradeMap.put(12, "高三");
-        String gradename = gradeMap.get(gradeid).toString();
-        return gradename;
-    }
 
     /**
-     * 分数百分比
+     * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指 定精度，以后的数字舍弃。
      *
-     * @param v1 分数
-     * @param v2 占比如80%写作0.8
-     * @return
+     * @param v1    被除数
+     * @param v2    除数
+     * @param scale 表示表示需要精确到小数点以后几位。
+     * @return 两个参数的商
      */
-    public static double getScoreRateScore(double v1, double v2) {
-        BigDecimal b1 = new BigDecimal(Double.toString(v1));
-        BigDecimal b2 = new BigDecimal(Double.toString(v2));
-
-        return b1.multiply(b2).setScale(0, BigDecimal.ROUND_HALF_UP).doubleValue();
-    }
-
-    /**
-     * @Description 分值平均后得到的值，如果整除返回数组元素1，未整除返回元素数量2
-     * @Param [num, score] 数量，分值
-     * @Return java.lang.Double[] 第一个未平均分值，第二个值为最后一个数的分值
-     * @Author wn
-     * @Date 2022/8/18 11:07
-     **/
-    public static Double[] getPointAvgScore(int num, Double score) {
-        BigDecimal bScore = new BigDecimal(Double.toString(score));
-        BigDecimal bNum = new BigDecimal(Integer.toString(num));
-
-        //2023-07-04通过四舍五入进行计算,
-        BigDecimal avg = bScore.divide(bNum, 1, BigDecimal.ROUND_HALF_UP);
-        BigDecimal avgAllScore = avg.multiply(bNum);//平均分乘以数量得到的分值
-        if (bScore.equals(avgAllScore)) {
-            //说明整除
-            return new Double[]{avg.doubleValue()};
-        } else {
-            //未整除，计算最后剩余分值，subtract总分减去平均分和数量的积
-            // 平均分加上剩余得分得到最后一个分值
-            BigDecimal lastScore = avg.add(bScore.subtract(avgAllScore));
-            return new Double[]{avg.doubleValue(), lastScore.doubleValue()};
+    public static double div(double v1, double v2, int scale) {
+        try {
+            if (scale < 0) {
+                throw new IllegalArgumentException("The   scale   must   be   a   positive   integer   or   zero");
+            }
+            BigDecimal b1 = new BigDecimal(Double.toString(v1));
+            BigDecimal b2 = new BigDecimal(Double.toString(v2));
+            return b1.divide(b2, scale, BigDecimal.ROUND_DOWN).doubleValue();
+        } catch (Exception e) {
+            return 0;
         }
     }
 
     /**
-     * @Description 是否是白名单接口
-     * @Date 2023/11/3 9:26
-     * @Author YWX
-     * @Param [requestURI, whitelistAPI]
-     * @Return boolean
-     **/
-    public static boolean whiteAPI(String requestURI, String whitelistAPI) {
-        boolean rtn = false;
-        if (isEmpty(whitelistAPI)) return rtn;
-
-        String[] apis = whitelistAPI.split(",");
-        for (String api : apis) {
-            if (requestURI.contains(api)) {
-                rtn = true;
-                break;
-            }
-        }
-        return rtn;
+     * 提供精确的加法运算。
+     *
+     * @param v1 被加数
+     * @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));
+        return b1.add(b2).doubleValue();
     }
 }

src/main/java/com/xhkjedu/vo/PaperStudentParams.java

@@ -23,8 +23,16 @@ public class PaperStudentParams {
     //学生答题卡图片
     private String stupic;
 
+    private Integer pagenum;
+
     private String examno;//学生准考证号
 
     //试卷中试题
     private List<EPaperStudentQuestion> questions;
+
+    //是否验证0待验证1验证通过2验证不通过
+    private Integer verified;
+
+    //是否和以前一致1一致2不一致
+    private Integer samed;
 }

src/main/resources/EPaperVerifyMapper.xml

@@ -17,6 +17,7 @@
         <result column="epsid" property="epsid" />
         <result column="epid" property="epid" />
         <result column="stupic" property="stupic" />
+        <result column="pagenum" property="pagenum" />
         <result column="studentid" property="studentid" />
         <result column="username" property="username" />
         <result column="examno" property="examno" />
@@ -36,7 +37,7 @@
         </collection>
     </resultMap>
     <select id="getStudentPaper" resultMap="stuPaper">
-        SELECT ps.epsid,ps.epid,ps.stupic,ps.studentid,u.username,u.examno,ps.classid,c.classname,pt.qtypename,psq.epsqid,psq.eptqid,psq.qn,psq.ctype,psq.stuanswer
+        SELECT ps.epsid,ps.epid,ps.stupic,ps.pagenum,ps.studentid,u.username,u.examno,ps.classid,c.classname,pt.qtypename,psq.epsqid,psq.eptqid,psq.qn,psq.ctype,psq.stuanswer
         FROM e_paper_student0608 ps LEFT JOIN e_paper_student_question0608 psq ON ps.epsid=psq.epsid
         left JOIN e_paper_qtype_question pt ON psq.eptqid=pt.eptid
         left join t_user u on ps.studentid=u.userid
@@ -54,4 +55,37 @@
         select eptqid,eptid,epid,ctype,questionid,qtypeid,qtypename,qn,score,qorder,answer
         from e_paper_qtype_question where epid=#{epid} order by qorder
     </select>
+
+    <!--批量修改学生试题-->
+    <update id="updateBatchStuQuestion">
+        <foreach collection="list" item="q" separator=";">
+            update e_paper_student_question set answered=#{q.answered},answertype=#{q.answertype},stuanswer=#{q.stuanswer}
+            ,stuanswertxt=#{q.stuanswertxt},converted=#{q.converted}
+            <if test="q.answertime!=null">
+                ,answertime=#{q.answertime}
+            </if>
+            ,stuscore=#{q.stuscore}
+            ,checked=#{q.checked}
+            <if test="q.checktime!=null">
+                ,checktime=#{q.checktime}
+            </if>
+            where epid=#{q.epid} and studentid=#{studentid} and eptqid=#{q.eptqid}
+        </foreach>
+    </update>
+
+    <!--修改试卷状态-->
+    <update id="updateStuPaper">
+        update e_paper_student set stupic=#{p.stupic},pagenum=#{p.pagenum},sstate=#{p.sstate},checked=#{p.checked},
+        stuscore=#{p.stuscore},verified=1 where epid=#{p.epid} and studentid=#{p.studentid}
+    </update>
+
+    <!--修改单独试卷审核状态-->
+    <update id="updateStuPaperVerified">
+        update e_paper_student set verified=#{p.verified} where epid=#{p.epid} and studentid=#{p.studentid}
+    </update>
+
+    <!--修改新表试卷状态-->
+    <update id="updateStuPaper0608">
+        update e_paper_student0608 set verified=#{p.verified},samed=#{p.samed} where epid=#{p.epid} and studentid=#{p.studentid}
+    </update>
 </mapper>