From 4ec7343bd6cf2c708f6abe038b1787f75b712e3c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 20 Jul 2021 09:07:04 +0800
Subject: [PATCH] 去除考试类型
---
src/main/java/org/springblade/modules/exam/entity/ExamScore.java | 4 ++--
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
index bdda593..d3ca4cd 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamScore.java
@@ -57,8 +57,8 @@
/**
* 考试类型 0：正式考试 1： 模拟考试 2：在线联系 3：调查问卷
*/
- @TableField("exam_type")
- private Integer examType;
+// @TableField("exam_type")
+// private Integer examType;
/**
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index b957086..dce17ed 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -21,9 +21,9 @@
<if test="examScore.securityName!=null and examScore.securityName!=''">
and security_name like concat('%', #{examScore.securityName},'%')
</if>
- <if test="examScore.examType!=null">
- and exam_type = #{examScore.examType}
- </if>
+<!-- <if test="examScore.examType!=null">-->
+<!-- and exam_type = #{examScore.examType}-->
+<!-- </if>-->
</select>
<!--考试成绩详情信息-->
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 f8c09c8..446729d 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
@@ -76,7 +76,7 @@
if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getExamSubjectChoices().getId())) {
//对比答案
- if (examExaminationSubject.getExamSubjectChoices().getChoicesType() == 2){
+ if (examExaminationSubject.getExamSubjectChoices().getChoicesType() == 2 || examExaminationSubject.getExamSubjectChoices().getChoicesType() == 3){
//判断题逻辑
if (examResultVO.getValue().equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
theoryGrade += examResultVO.getGrade();
--
Gitblit v1.9.3