From 10ca479bf55120b338f9d2c6b1e3100190b5a035 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 30 五月 2024 09:36:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/enums/AnswerInvalidEnum.java | 2 +-
src/main/resources/mapper/ExamPaperAnswerMapper.xml | 6 +++---
src/main/java/com/mindskip/xzs/service/impl/QuestionAnswerServiceImpl.java | 7 +------
src/main/java/com/mindskip/xzs/repository/QuestionAnswerMapper.java | 8 ++++++++
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/enums/AnswerInvalidEnum.java b/src/main/java/com/mindskip/xzs/domain/enums/AnswerInvalidEnum.java
index b60e0e4..24d8ee1 100644
--- a/src/main/java/com/mindskip/xzs/domain/enums/AnswerInvalidEnum.java
+++ b/src/main/java/com/mindskip/xzs/domain/enums/AnswerInvalidEnum.java
@@ -14,8 +14,8 @@
VALID("0", "鏈夋晥"),
INVALID("1", "鏃犳晥"),
+ DEPRIVATION("2", "鍙栨秷琛ヨ�冭祫鏍�"),
;
-
@EnumValue // 鏍囨槑璇ュ瓧娈靛瓨鍏ユ暟鎹簱
private final String code;
diff --git a/src/main/java/com/mindskip/xzs/repository/QuestionAnswerMapper.java b/src/main/java/com/mindskip/xzs/repository/QuestionAnswerMapper.java
index aa04b79..44ade73 100644
--- a/src/main/java/com/mindskip/xzs/repository/QuestionAnswerMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/QuestionAnswerMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mindskip.xzs.domain.QuestionAnswer;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
/**
* @author gonghl
@@ -13,6 +14,13 @@
@Mapper
public interface QuestionAnswerMapper extends BaseMapper<QuestionAnswer> {
+ /**
+ * 鏂板鏃惰幏鍙栫洰鍓嶆渶澶у簭鍒�
+ * @return 搴忓彿
+ */
+ @Select("select ifnull(max(sequence), 1) from t_question_answer")
+ Integer getLastSequence();
+
}
diff --git a/src/main/java/com/mindskip/xzs/service/impl/QuestionAnswerServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/QuestionAnswerServiceImpl.java
index 3d4c38d..1ddd6c8 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/QuestionAnswerServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/QuestionAnswerServiceImpl.java
@@ -15,7 +15,6 @@
import org.springframework.util.StringUtils;
import java.util.List;
-import java.util.Objects;
/**
* @author gonghl
@@ -57,11 +56,7 @@
@Override
public Integer getLastSequence() {
- QuestionAnswer one = new LambdaQueryChainWrapper<>(questionAnswerMapper)
- .orderByDesc(QuestionAnswer::getSequence)
- .last("limit 1")
- .one();
- return Objects.isNull(one) ? 1 : one.getSequence() + 1;
+ return questionAnswerMapper.getLastSequence();
}
}
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 41b3ece..dd8c0c1 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -233,7 +233,7 @@
<update id="setMissExam">
update t_exam_paper_answer
- set invalid = 1
+ set invalid = 2
where exam_paper_id = #{examPaperId}
and create_user in (
<foreach collection="userIds" item="item" index="index" separator=",">
@@ -244,7 +244,7 @@
<update id="setMissExamByTemplate">
update t_exam_paper_answer
- set invalid = 1
+ set invalid = 2
where exam_paper_id
in
<foreach collection="paperIds" item="item" separator="," open="(" close=")">
@@ -354,7 +354,7 @@
(#{item.examPaperId},#{item.userId})
</foreach>
</if>
- and (invalid = 0 or invalid is null)
+ and (invalid = 0 or invalid is null or invalid = 2)
</select>
<select id="adminPageByGrade" resultMap="BaseResultMap" parameterType="com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM">
select
--
Gitblit v1.8.0