From b51e8bc94eee7074da1ea3457d5d574f4887572d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 31 Jul 2021 17:58:55 +0800
Subject: [PATCH] 新增字段，新增查询考试人员信息接口
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index 9870fb5..5322df1 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -7,18 +7,20 @@
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 java.util.Map;
+
+import static com.bstek.ureport.expression.model.condition.Join.and;
/**
* 考试成绩服务实现类
@@ -65,17 +67,36 @@
ExamPaper examPaper = new ExamPaper();
examPaper.setId(examScore.getPapersId());
List<ExamExaminationSubject> examExaminationSubjects
- = examPaperService.queryPagerSubject(examPaper).getExamExaminationSubjects();
+ = examPaperService.PagerSubject(examPaper).getExamExaminationSubjects();
//比对考试结果
//声明理论得分
int theoryGrade = 0;
for (ExamResultVO examResultVO : examResultVOS) {
for (ExamExaminationSubject examExaminationSubject : examExaminationSubjects) {
//对比题目id
- if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getSubjectId())) {
+ if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getExamSubjectChoices().getId())) {
//对比答案
- if (examResultVO.getValue().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);
@@ -85,8 +106,14 @@
}
//设置理论得分
examScore.setTheoryGrade(theoryGrade);
- //计算总成绩
- examScore.setAllGrade(theoryGrade + examScore.getLearnGrade());
+ //计算总成绩,此时没有实操成绩，总成绩为实操成绩和理论成绩和的一半
+ examScore.setAllGrade(Math.round(theoryGrade/2));
+ //设置状态
+ if (theoryGrade>=60){
+ examScore.setQualified(2);
+ }else {
+ examScore.setQualified(1);
+ }
//保存成绩数据
int i = baseMapper.insert(examScore);
if (i>0){
@@ -97,4 +124,37 @@
//返回结果
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);
+ }
+ }
+ });
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> scoreStatistics() {
+ return baseMapper.scoreStatistics();
+ }
}
--
Gitblit v1.9.3