考试成绩导入接口修改，查询接口修改

Administrator

2021-07-29 92b71ac07ad4e0b7282135cad0919a4be4ec1efb

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -7,19 +7,19 @@
import org.springblade.modules.exam.entity.ExamExaminationSubject;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.mapper.ExamScoreMapper;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
import org.springblade.modules.exam.vo.ExamResultVO;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import static com.bstek.ureport.expression.model.condition.Join.and;

/**
 * 考试成绩服务实现类
@@ -75,19 +75,27 @@
               //对比题目id
               if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getExamSubjectChoices().getId())) {
                  //对比答案
                  //处理多选题的答案排序
                  String[] split = examResultVO.getValue().split(",");
                  StringBuilder builder = new StringBuilder();
                  for (String s : split) {
                     builder.append(s);
                  }
                  char[] arrayCh = builder.toString().toCharArray();
                  //利用数组帮助类自动排序
                  Arrays.sort(arrayCh);
                  String sub0 = Arrays.toString(arrayCh);
                  String sub = sub0.substring(1,sub0.length()-1).replaceAll(" ","");
                  if (sub.equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
                     theoryGrade += examResultVO.getGrade();

                  if (examExaminationSubject.getExamSubjectChoices().getChoicesType() == 2 || examExaminationSubject.getExamSubjectChoices().getChoicesType() == 3){
                     //判断题逻辑
                     if (examResultVO.getValue().equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
                        theoryGrade += examResultVO.getGrade();
                     }
                  }else if(examExaminationSubject.getExamSubjectChoices().getChoicesType() == 0 || examExaminationSubject.getExamSubjectChoices().getChoicesType() == 1){
                     //处理多选题的答案排序
                     String[] split = examResultVO.getValue().split(",");
                     StringBuilder builder = new StringBuilder();
                     for (String s : split) {
                        builder.append(s);
                     }
                     char[] arrayCh = builder.toString().toCharArray();
                     //利用数组帮助类自动排序
                     Arrays.sort(arrayCh);
                     String sub0 = Arrays.toString(arrayCh);
                     String sub = sub0.substring(1,sub0.length()-1).replaceAll(" ","");
                     if (sub.equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
                        theoryGrade += examResultVO.getGrade();
                     }
                  }
                  //移除当前试卷题目答案对象
                  examExaminationSubjects.remove(examExaminationSubject);
@@ -115,4 +123,32 @@
      //返回结果
      return false;
   }

   /**
    * 导入实操成绩
    * @param examScoreExcelList
    * @param isCovered 是否覆盖
    */
   @Override
   public void importExamScore(List<ExamScoreExcel> examScoreExcelList, Boolean isCovered) {
      if (examScoreExcelList.size()>0){
         examScoreExcelList.forEach(examScoreExcel -> {
            if (null!=examScoreExcel.getLearnGrade() && null!=examScoreExcel.getIdCardNo() && examScoreExcel.getIdCardNo()!=""){
               ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo());
               if (null!=examScore) {
                  examScore.setLearnGrade(examScoreExcel.getLearnGrade());
                  if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
                     //合格
                     examScore.setQualified(0);
                  } else {
                     //不合格
                     examScore.setQualified(1);
                  }
                  //更新成绩数据
                  baseMapper.updateById(examScore);
               }
            }
         });
      }
   }
}