1.0.4 赋分计算

pom.xml

@@ -35,6 +35,7 @@
         <netty-all.version>4.1.49.Final</netty-all.version>
         <easyexcel.version>3.0.5</easyexcel.version>
         <bcprov.version>1.52</bcprov.version>
+        <googlecode.aviator.version>5.0.1</googlecode.aviator.version>
         <dysmsapi.version>1.1.0</dysmsapi.version>
     </properties>
 
@@ -213,6 +214,11 @@
                 <artifactId>tools-common</artifactId>
                 <version>${qmth.boot.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.googlecode.aviator</groupId>
+                <artifactId>aviator</artifactId>
+                <version>${googlecode.aviator.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -368,6 +374,10 @@
             <groupId>com.qmth.boot</groupId>
             <artifactId>tools-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.aviator</groupId>
+            <artifactId>aviator</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/qmth/eds/bean/dto/ExamSyncStudentDto.java

@@ -13,6 +13,8 @@ public class ExamSyncStudentDto extends ExamSyncStudent {
 
     private String totalScore;
 
+    private String assignScore;
+
     public Long getCloudMarkingScoreId() {
         return cloudMarkingScoreId;
     }
@@ -28,4 +30,12 @@ public class ExamSyncStudentDto extends ExamSyncStudent {
     public void setTotalScore(String totalScore) {
         this.totalScore = totalScore;
     }
+
+    public String getAssignScore() {
+        return assignScore;
+    }
+
+    public void setAssignScore(String assignScore) {
+        this.assignScore = assignScore;
+    }
 }

src/main/java/com/qmth/eds/common/entity/ExamAssign.java

@@ -1,5 +1,7 @@
 package com.qmth.eds.common.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.eds.common.enums.ExamAssignStatusEnum;
@@ -48,6 +50,10 @@ public class ExamAssign extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "状态")
     private ExamAssignStatusEnum status;
 
+    @ApiModelProperty(value = "状态")
+    @TableField(value = "error_msg", updateStrategy = FieldStrategy.IGNORED)
+    private String errorMsg;
+
     public Long getSchoolId() {
         return schoolId;
     }
@@ -119,4 +125,12 @@ public class ExamAssign extends BaseEntity implements Serializable {
     public void setStatus(ExamAssignStatusEnum status) {
         this.status = status;
     }
+
+    public String getErrorMsg() {
+        return errorMsg;
+    }
+
+    public void setErrorMsg(String errorMsg) {
+        this.errorMsg = errorMsg;
+    }
 }

src/main/java/com/qmth/eds/service/AsyncTaskService.java

@@ -2,7 +2,9 @@ package com.qmth.eds.service;
 
 import com.qmth.eds.common.entity.ExamAssign;
 import com.qmth.eds.common.entity.ExamScheduleTask;
+import com.qmth.eds.common.entity.ExamSyncTotal;
 import com.qmth.eds.common.entity.TBSyncTask;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import com.qmth.eds.common.enums.TaskTypeEnum;
 import com.qmth.eds.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
@@ -21,6 +23,9 @@ public class AsyncTaskService {
     @Resource
     private TBSyncTaskService tbSyncTaskService;
 
+    @Resource
+    private ExamSyncTotalService examSyncTotalService;
+
     /**
      * 同步试卷结构、分组信息、评卷员绑定关系
      */
@@ -32,6 +37,10 @@ public class AsyncTaskService {
 
     public void syncStudentScore(Long semesterId, Long examTypeId, Long collegeId, Integer examId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        ExamSyncTotal examSyncTotal = examSyncTotalService.getBySemesterIdAndExamTypeIdAndUseFile(schoolId, semesterId, examTypeId, true);
+        if (examSyncTotal == null) {
+            throw ExceptionResultEnum.ERROR.exception("未设置使用数据文件，请联系管理员处理");
+        }
         // 记录日志
         String remark = "云阅卷考试：" + examId;
         TBSyncTask tbSyncTask = tbSyncTaskService.saveTask(collegeId, semesterId, examTypeId, TaskTypeEnum.CLOUD_MARKING_STUDENT_SCORE, remark);

src/main/java/com/qmth/eds/service/ExamSyncTotalService.java

@@ -23,5 +23,7 @@ public interface ExamSyncTotalService extends IService<ExamSyncTotal> {
 
     ExamSyncTotal getBySemesterIdAndExamTypeIdAndDownloadStatus(Long schoolId, Long semesterId, Long examTypeId, boolean status);
 
+    ExamSyncTotal getBySemesterIdAndExamTypeIdAndUseFile(Long schoolId, Long semesterId, Long examTypeId, boolean status);
+
     boolean used(Long id);
 }

src/main/java/com/qmth/eds/service/impl/ExamAssignServiceImpl.java

@@ -46,21 +46,23 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
         Page<ExamAssignDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamAssignDto> assignListDtoIPage = this.baseMapper.pageData(page, sysUser.getOrgId(), semesterId, examTypeId, courseCode);
 
-        ExamSyncTotal examSyncTotal = examSyncTotalService.getBySemesterIdAndExamTypeIdAndDownloadStatus(schoolId, semesterId, examTypeId, true);
+        ExamSyncTotal examSyncTotal = examSyncTotalService.getBySemesterIdAndExamTypeIdAndUseFile(schoolId, semesterId, examTypeId, true);
+        if (examSyncTotal == null) {
+            throw ExceptionResultEnum.ERROR.exception("未设置使用数据文件，请联系管理员处理");
+        }
         for (ExamAssignDto record : assignListDtoIPage.getRecords()) {
             int actualCount = 0;
             String kkxy = "";
-            if (examSyncTotal != null) {
-                List<ExamSyncStudent> examSyncStudents = examSyncStudentService.listByExamSyncTotalId(examSyncTotal);
-                if (!CollectionUtils.isEmpty(examSyncStudents)) {
-                    List<ExamSyncStudent> syncStudents = examSyncStudents.stream().filter(m -> m.getCloudMarkingCourseCode().equals(courseCode)).collect(Collectors.toList());
-                    actualCount = syncStudents.size();
-                    List<String> kkxyList = syncStudents.stream().map(ExamSyncStudent::getKkbm).distinct().collect(Collectors.toList());
-                    if (!CollectionUtils.isEmpty(kkxyList) && kkxyList.size() > 1) {
-                        throw ExceptionResultEnum.ERROR.exception(String.format("课程[%s]查询出%d个开课学院，请联系管理员检查数据", courseCode, kkxyList.size()));
-                    }
-                    kkxy = kkxyList.get(0);
+
+            List<ExamSyncStudent> examSyncStudents = examSyncStudentService.listByExamSyncTotalId(examSyncTotal);
+            if (!CollectionUtils.isEmpty(examSyncStudents)) {
+                List<ExamSyncStudent> syncStudents = examSyncStudents.stream().filter(m -> m.getCloudMarkingCourseCode().equals(courseCode)).collect(Collectors.toList());
+                actualCount = syncStudents.size();
+                List<String> kkxyList = syncStudents.stream().map(ExamSyncStudent::getKkbm).distinct().collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(kkxyList) && kkxyList.size() > 1) {
+                    throw ExceptionResultEnum.ERROR.exception(String.format("课程[%s]查询出%d个开课学院，请联系管理员检查数据", courseCode, kkxyList.size()));
                 }
+                kkxy = kkxyList.get(0);
             }
             record.setActualCount(actualCount);
             record.setOpenCollege(kkxy);
@@ -124,16 +126,17 @@ public class ExamAssignServiceImpl extends ServiceImpl<ExamAssignMapper, ExamAss
             BeanUtils.copyProperties(examAssign, examAssignDto);
         }
 
-        ExamSyncTotal examSyncTotal = examSyncTotalService.getBySemesterIdAndExamTypeIdAndDownloadStatus(schoolId, semesterId, examTypeId, true);
+        ExamSyncTotal examSyncTotal = examSyncTotalService.getBySemesterIdAndExamTypeIdAndUseFile(schoolId, semesterId, examTypeId, true);
+        if (examSyncTotal == null) {
+            throw ExceptionResultEnum.ERROR.exception("未设置使用数据文件，请联系管理员处理");
+        }
         int actualCount = 0;
         List<String> kcxyList = new ArrayList<>();
-        if (examSyncTotal != null) {
-            List<ExamSyncStudent> examSyncStudents = examSyncStudentService.listByExamSyncTotalId(examSyncTotal);
-            if (!CollectionUtils.isEmpty(examSyncStudents)) {
-                List<ExamSyncStudent> syncStudents = examSyncStudents.stream().filter(m -> m.getCloudMarkingCourseCode().equals(courseCode) && m.getKkbm().equals(openCollege)).collect(Collectors.toList());
-                actualCount = syncStudents.size();
-                kcxyList = syncStudents.stream().map(ExamSyncStudent::getJgmc).distinct().collect(Collectors.toList());
-            }
+        List<ExamSyncStudent> examSyncStudents = examSyncStudentService.listByExamSyncTotalId(examSyncTotal);
+        if (!CollectionUtils.isEmpty(examSyncStudents)) {
+            List<ExamSyncStudent> syncStudents = examSyncStudents.stream().filter(m -> m.getCloudMarkingCourseCode().equals(courseCode) && m.getKkbm().equals(openCollege)).collect(Collectors.toList());
+            actualCount = syncStudents.size();
+            kcxyList = syncStudents.stream().map(ExamSyncStudent::getJgmc).distinct().collect(Collectors.toList());
         }
         examAssignDto.setActualCount(actualCount);
         examAssignDto.setInspectCollege(kcxyList);

src/main/java/com/qmth/eds/service/impl/ExamSyncTotalServiceImpl.java

@@ -102,6 +102,16 @@ public class ExamSyncTotalServiceImpl extends ServiceImpl<ExamSyncTotalMapper, E
         return this.getOne(queryWrapper);
     }
 
+    @Override
+    public ExamSyncTotal getBySemesterIdAndExamTypeIdAndUseFile(Long schoolId, Long semesterId, Long examTypeId, boolean status) {
+        QueryWrapper<ExamSyncTotal> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ExamSyncTotal::getSchoolId, schoolId)
+                .eq(ExamSyncTotal::getSemesterId, semesterId)
+                .eq(ExamSyncTotal::getExamTypeId, examTypeId)
+                .eq(ExamSyncTotal::getUseFile, status);
+        return this.getOne(queryWrapper);
+    }
+
     @Transactional
     @Override
     public boolean used(Long id) {

src/main/java/com/qmth/eds/service/impl/WhuDataSyncServiceImpl.java

@@ -4,21 +4,19 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.googlecode.aviator.AviatorEvaluator;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.eds.bean.dto.ExamSyncStudentDto;
 import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.common.entity.*;
-import com.qmth.eds.common.enums.ExamAssignStatusEnum;
-import com.qmth.eds.common.enums.ExceptionResultEnum;
-import com.qmth.eds.common.enums.TaskResultEnum;
-import com.qmth.eds.common.enums.TaskStatusEnum;
+import com.qmth.eds.common.enums.*;
 import com.qmth.eds.common.tools.CloudMarkingUtils;
 import com.qmth.eds.common.tools.WhuUtils;
 import com.qmth.eds.common.util.FileUtil;
-import com.qmth.eds.common.util.ServletUtil;
 import com.qmth.eds.service.*;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,11 +25,14 @@ import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -276,27 +277,114 @@ public class WhuDataSyncServiceImpl implements WhuDataSyncService {
     public void calcAssignScore(ExamAssign examAssign) {
         examAssign.setStatus(ExamAssignStatusEnum.RUNNING);
         examAssignService.updateById(examAssign);
+        String errorMsg = null;
         try {
             // 选模式
-
             // 解析计算参数
+            JSONObject object = JSON.parseObject(examAssign.getCoefficient());
+            Boolean all = object.getBoolean("all");
+            Double allValue = object.getDoubleValue("value");
 
+            List<ExamSyncStudentDto> finalList = new ArrayList<>();
             List<ExamSyncStudentDto> examSyncStudentDtoList = cloudMarkingScoreService.listExamSyncStudentDtos(examAssign.getSchoolId(), examAssign.getSemesterId(), examAssign.getExamTypeId(), examAssign.getCourseCode(), examAssign.getOpenCollege());
-            Map<String, List<ExamSyncStudentDto>> collect = examSyncStudentDtoList.stream().collect(Collectors.groupingBy(ExamSyncStudentDto::getJgmc));
-            for (Map.Entry<String, List<ExamSyncStudentDto>> entry : collect.entrySet()) {
-
+            // 初始卷面最高分
+            Double maxTotalScore = examSyncStudentDtoList.stream().map(m -> Double.parseDouble(m.getTotalScore())).max(Comparator.comparingDouble(x -> x)).get();
+            if (all) {
+                // 卷面最高分
+                calcProgress(examAssign.getFormula(), allValue, examSyncStudentDtoList, maxTotalScore, finalList);
+            } else {
+                Map<String, List<ExamSyncStudentDto>> collect = examSyncStudentDtoList.stream().collect(Collectors.groupingBy(ExamSyncStudentDto::getJgmc));
+                for (Map.Entry<String, List<ExamSyncStudentDto>> entry : collect.entrySet()) {
+                    String college = entry.getKey();
+                    List<JSONObject> details = JSON.parseArray(object.getString("detail"), JSONObject.class);
+                    Optional<JSONObject> objectOptional = details.stream().filter(m -> m.getString("college").equals(college)).findFirst();
+                    if (!objectOptional.isPresent()) {
+                        throw ExceptionResultEnum.ERROR.exception(String.format("开课学院[%s]未设置的参数值", college));
+                    }
+                    double collegeValue = objectOptional.get().getDoubleValue("value");
+                    calcProgress(examAssign.getFormula(), collegeValue, entry.getValue(), maxTotalScore, finalList);
+                }
             }
 
             // 更新云阅卷同步表中的赋分值
+            if (CollectionUtils.isEmpty(finalList)) {
+                throw ExceptionResultEnum.ERROR.exception("赋分值计算失败，请联系管理员");
+            }
+
+            for (ExamSyncStudentDto studentDto : finalList) {
+                UpdateWrapper<CloudMarkingScore> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.lambda().set(CloudMarkingScore::getAssignScore, studentDto.getAssignScore())
+                        .eq(CloudMarkingScore::getId, studentDto.getCloudMarkingScoreId());
+                cloudMarkingScoreService.update(updateWrapper);
+            }
 
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            errorMsg = e.getMessage();
         } finally {
             examAssign.setStatus(ExamAssignStatusEnum.FINISH);
+            examAssign.setErrorMsg(errorMsg);
             examAssignService.updateById(examAssign);
         }
     }
 
+    /**
+     * 计算公共方法
+     *
+     * @param formula                公式
+     * @param value                  系数
+     * @param examSyncStudentDtoList 源数据
+     * @param finalList              计算后数据
+     */
+    private void calcProgress(FormulaEnum formula, Double value, List<ExamSyncStudentDto> examSyncStudentDtoList, Double maxTotalScore, List<ExamSyncStudentDto> finalList) {
+        // 公式1（赋值分=卷面成绩+ (100- 卷面成绩)/赋分系数）
+        if (FormulaEnum.FORMULA1.equals(formula)) {
+            // x为卷面成绩，y为赋分系数
+            String formula1 = "a+(100-x)/b";
+            Map<String, Object> paramMap = new HashMap<>();
+            paramMap.put("b", value);
+            for (ExamSyncStudentDto studentDto : examSyncStudentDtoList) {
+                paramMap.put("a", studentDto.getTotalScore());
+                String assignScore = AviatorEvaluator.compile(formula1).execute(paramMap).toString();
+                studentDto.setAssignScore(assignScore);
+                finalList.add(studentDto);
+            }
+        }
+        // 公式2
+        /*
+         * 赋值分=ROUND(IF(初始卷面>=参数,55+(初始卷面-参数)/（初始卷面最高分-参数)*（x-55）,初始卷面*50/参数)*2,0)/2
+            说明：1.如果初始卷面最高的大于99时，则x=100，否则x=99；
+                 2.参数根据每次总体初始成绩的不及格率进行调整。
+         */
+        else if (FormulaEnum.FORMULA2.equals(formula)) {
+            int x = maxTotalScore.doubleValue() > 99 ? 100 : 99;
+            // a:初始卷面，b:参数，c:初始卷面最高分，x:说明1中参数
+            String formula2_1 = "(55+(a-b)/(c-b)*(x-55))*2";
+            String formula2_2 = "(a*50/b)*2";
+
+            for (ExamSyncStudentDto studentDto : examSyncStudentDtoList) {
+                Map<String, Object> paramMap = new HashMap<>();
+                Double totalScore = Double.valueOf(studentDto.getTotalScore());
+                String tempAssignScore;
+                if (totalScore >= value) {
+                    paramMap.put("a", totalScore.doubleValue());
+                    paramMap.put("b", value);
+                    paramMap.put("c", maxTotalScore.doubleValue());
+                    paramMap.put("x", maxTotalScore.doubleValue());
+                    tempAssignScore = AviatorEvaluator.compile(formula2_1).execute(paramMap).toString();
+                } else {
+                    paramMap.put("a", totalScore.doubleValue());
+                    paramMap.put("b", value.doubleValue());
+                    tempAssignScore = AviatorEvaluator.compile(formula2_2).execute(paramMap).toString();
+                }
+
+                BigDecimal bigDecimal = new BigDecimal(tempAssignScore).setScale(0, RoundingMode.HALF_UP);
+                String assignScore = bigDecimal.divide(new BigDecimal("2")).toString();
+                studentDto.setAssignScore(assignScore);
+                finalList.add(studentDto);
+            }
+        }
+    }
+
     @Transactional
     public void saveScoreData(Long schoolId, Long collegeId, Long semesterId, Long examTypeId, Integer examId, List<CloudMarkingScore> cloudMarkingScoreList) {
         // 删除旧数据
@@ -317,34 +405,24 @@ public class WhuDataSyncServiceImpl implements WhuDataSyncService {
         }
 
         // 查询对外数据
-        QueryWrapper<ExamSyncTotal> totalQueryWrapper = new QueryWrapper<>();
-        totalQueryWrapper.lambda().eq(ExamSyncTotal::getSchoolId, schoolId)
-                .eq(ExamSyncTotal::getSemesterId, semesterId)
-                .eq(ExamSyncTotal::getExamTypeId, examTypeId)
-                .eq(ExamSyncTotal::getDownloadStatus, true)
-                .orderByDesc(ExamSyncTotal::getSyncDate);
-        List<ExamSyncTotal> examSyncTotalList = examSyncTotalService.list(totalQueryWrapper);
+        ExamSyncTotal examSyncTotal = examSyncTotalService.getBySemesterIdAndExamTypeIdAndUseFile(schoolId, semesterId, examTypeId, true);
+        if (examSyncTotal == null) {
+            throw ExceptionResultEnum.ERROR.exception("未设置使用数据文件，请联系管理员处理");
+        }
         List<CloudMarkingScoreForeign> cloudMarkingScoreForeigns = new ArrayList<>();
-        if (!examSyncTotalList.isEmpty()) {
-            ExamSyncTotal examSyncTotal = examSyncTotalList.get(0);
-            List<ExamSyncStudent> examSyncStudents = examSyncStudentService.listByExamSyncTotalId(examSyncTotal);
-            for (CloudMarkingScore cloudMarkingScore : cloudMarkingScoreList) {
-                Optional<ExamSyncStudent> optional = examSyncStudents.stream()
-                        .filter(s -> s.getJxbmc().equals(cloudMarkingScore.getClassName())
-                                && ((StringUtils.isBlank(s.getCloudMarkingCourseCode()) && s.getKch().equals(cloudMarkingScore.getSubjectCode())) || (StringUtils.isNotBlank(s.getCloudMarkingCourseCode()) && s.getCloudMarkingCourseCode().equals(cloudMarkingScore.getSubjectCode())))
-                                && s.getXh().equals(cloudMarkingScore.getStudentCode())).findFirst();
-                if (!optional.isPresent()) {
-                    cloudMarkingScoreForeigns.add(new CloudMarkingScoreForeign(collegeId, semesterId, examTypeId, examId, null, null, null, cloudMarkingScore.getSubjectCode(), cloudMarkingScore.getSubjectName(), cloudMarkingScore.getStudentCode(), cloudMarkingScore.getTotalScore()));
-                } else {
-                    ExamSyncStudent examSyncStudent = optional.get();
-                    // 匹配上，保存考务数据表ID
-                    cloudMarkingScore.setExamSyncStudentId(examSyncStudent.getId());
-                    cloudMarkingScoreForeigns.add(new CloudMarkingScoreForeign(collegeId, semesterId, examTypeId, examId, examSyncStudent.getXnm(), examSyncStudent.getXqm(), examSyncStudent.getJxbId(), examSyncStudent.getKch(), examSyncStudent.getKcmc(), examSyncStudent.getXh(), cloudMarkingScore.getTotalScore()));
-                }
-            }
-        } else {
-            for (CloudMarkingScore cloudMarkingScore : cloudMarkingScoreList) {
+        List<ExamSyncStudent> examSyncStudents = examSyncStudentService.listByExamSyncTotalId(examSyncTotal);
+        for (CloudMarkingScore cloudMarkingScore : cloudMarkingScoreList) {
+            Optional<ExamSyncStudent> optional = examSyncStudents.stream()
+                    .filter(s -> s.getJxbmc().equals(cloudMarkingScore.getClassName())
+                            && ((StringUtils.isBlank(s.getCloudMarkingCourseCode()) && s.getKch().equals(cloudMarkingScore.getSubjectCode())) || (StringUtils.isNotBlank(s.getCloudMarkingCourseCode()) && s.getCloudMarkingCourseCode().equals(cloudMarkingScore.getSubjectCode())))
+                            && s.getXh().equals(cloudMarkingScore.getStudentCode())).findFirst();
+            if (!optional.isPresent()) {
                 cloudMarkingScoreForeigns.add(new CloudMarkingScoreForeign(collegeId, semesterId, examTypeId, examId, null, null, null, cloudMarkingScore.getSubjectCode(), cloudMarkingScore.getSubjectName(), cloudMarkingScore.getStudentCode(), cloudMarkingScore.getTotalScore()));
+            } else {
+                ExamSyncStudent examSyncStudent = optional.get();
+                // 匹配上，保存考务数据表ID
+                cloudMarkingScore.setExamSyncStudentId(examSyncStudent.getId());
+                cloudMarkingScoreForeigns.add(new CloudMarkingScoreForeign(collegeId, semesterId, examTypeId, examId, examSyncStudent.getXnm(), examSyncStudent.getXqm(), examSyncStudent.getJxbId(), examSyncStudent.getKch(), examSyncStudent.getKcmc(), examSyncStudent.getXh(), cloudMarkingScore.getTotalScore()));
             }
         }
 

src/main/resources/db/log/log-1.0.4.sql

@@ -22,7 +22,7 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('53', '赋分准备计算', '/api/assign/to_calc', 'URL', '45', '6', 'AUTH', '1', '1', '1');
 INSERT INTO `sys_privilege` VALUES (54, '查询考查学院列表', '/api/common/examine/college/list', 'URL', 45, 7, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` VALUES (55, '查询班级列表', '/api/common/clazz/list', 'URL', 45, 8, 'SYS', NULL, 1, 1, 1);
-INSERT INTO `sys_privilege` VALUES (56, '查询班级列表', '/api/common/teacher/list', 'URL', 45, 9, 'SYS', NULL, 1, 1, 1);
+INSERT INTO `sys_privilege` VALUES (56, '查询任课老师列表', '/api/common/teacher/list', 'URL', 45, 9, 'SYS', NULL, 1, 1, 1);
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('57', '考务数据列表-设置使用当前数据文件', '/api/exam_sync_total/used', 'URL', '9', '4', 'AUTH', '1', '1', '1');
 
 
@@ -49,6 +49,7 @@ CREATE TABLE `exam_assign` (
      `formula` VARCHAR(45) NULL COMMENT '公式类型（类型1或者类型2）',
      `coefficient` MEDIUMTEXT NULL COMMENT '系统对象（json格式）',
      `status` VARCHAR(45) NULL COMMENT '状态（INIT-未计算，RUNNING-计算中，FINISH-计算完成）',
+     `error_msg` MEDIUMTEXT NULL COMMENT '错误原因（成功时为null，失败时为失败原因）',
      `create_id` BIGINT(20) NULL,
      `create_time` BIGINT(20) NULL,
      `update_id` BIGINT(20) NULL,

src/test/java/com/qmth/eds/AviatorTest.java

@@ -0,0 +1,48 @@
+package com.qmth.eds;
+
+import com.googlecode.aviator.AviatorEvaluator;
+import com.qmth.eds.common.entity.ExamSyncStudentTemp;
+import com.qmth.eds.common.tools.WhuUtils;
+import com.qmth.eds.job.service.JobService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 武汉大学测试类
+ */
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class AviatorTest {
+
+    @Test
+    public void test() {
+
+    }
+
+    public static void main(String[] args) {
+        String formula1 = "x+(100-x)/y";
+
+        Map<String, Object> paramMap=new HashMap<>();
+        paramMap.put("x", 80);
+        paramMap.put("y", 0.5);
+        String string = AviatorEvaluator.compile(formula1).execute(paramMap).toString();
+        System.out.println(string);
+
+        String string1 = AviatorEvaluator.execute("1.2+3+4").toString();
+        System.out.println(string1);
+
+        Map<String, Object> paramMap1=new HashMap<>();
+        paramMap1.put("a", 5);
+        paramMap1.put("b", 4);
+        String string2 = AviatorEvaluator.compile("a/(b-1.0)").execute(paramMap1).toString();
+        System.out.println(string2);
+    }
+
+}