From d34df615e1f20c2a5bd3bcc0e1492bff9d649c42 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 六月 2024 14:25:14 +0800
Subject: [PATCH] 增加阅卷状态
---
src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java | 6 +++++-
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 1 +
src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java | 5 +++++
src/main/resources/mapper/ClassesUserMapper.xml | 4 +++-
src/main/java/com/ycl/jxkg/domain/vo/StudentExamInfoVO.java | 3 +++
5 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java
index 0135a9b..d65d7a4 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamSubmitTemp.java
@@ -39,9 +39,13 @@
private String examSubmit;
@TableField("status")
- /** 鐘舵�侊細涓存椂銆佷繚瀛� */
+ /** 鐘舵�侊細涓存椂銆佸畬鎴� */
private ExamSubmitTempStatusEnum status;
+ @TableField("mark_paper_status")
+ /** 鐘舵�侊細涓存椂銆佸畬鎴� */
+ private ExamSubmitTempStatusEnum markPaperStatus;
+
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java
index d68348c..c844d63 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitTempVO.java
@@ -3,6 +3,8 @@
import com.ycl.jxkg.domain.base.AbsVo;
import com.ycl.jxkg.domain.entity.ExamSubmitTemp;
import java.util.List;
+
+import com.ycl.jxkg.enums.general.ExamSubmitTempStatusEnum;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -37,6 +39,9 @@
/** 鐘舵�侊細涓存椂銆佷繚瀛� */
private String status;
+ /** 鐘舵�侊細涓存椂銆佸畬鎴� */
+ private String markPaperStatus;
+
public static ExamSubmitTempVO getVoByEntity(@NonNull ExamSubmitTemp entity, ExamSubmitTempVO vo) {
if(vo == null) {
vo = new ExamSubmitTempVO();
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/StudentExamInfoVO.java b/src/main/java/com/ycl/jxkg/domain/vo/StudentExamInfoVO.java
index c6a76fa..02ac13a 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/StudentExamInfoVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/StudentExamInfoVO.java
@@ -29,6 +29,9 @@
private Date updateTime;
+ /** 闃呭嵎鐘舵�� */
+ private ExamSubmitTempStatusEnum markPaperStatus;
+
/** 鍙嶅簭鍒楀寲鍚庣殑棰� */
private List<DoQuestionVO> questionList;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index 438aff3..a73b531 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -219,6 +219,7 @@
examSubmitTemp.setStatus(status);
examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getQuestionList()));
+ examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
examSubmitTempMapper.insert(examSubmitTemp);
}
}
diff --git a/src/main/resources/mapper/ClassesUserMapper.xml b/src/main/resources/mapper/ClassesUserMapper.xml
index f981e6d..23d914e 100644
--- a/src/main/resources/mapper/ClassesUserMapper.xml
+++ b/src/main/resources/mapper/ClassesUserMapper.xml
@@ -21,6 +21,7 @@
<result column="status" property="status" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
<result column="phone" property="phone"/>
<result column="update_time" property="updateTime"/>
+ <result column="mark_paper_status" property="markPaperStatus" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
</resultMap>
@@ -59,7 +60,8 @@
TU.phone,
EST.do_time,
EST.status,
- EST.exam_submit
+ EST.exam_submit,
+ EST.mark_paper_status
FROM
t_classes_user TCU
INNER JOIN t_user TU ON TU.id = TCU.user_id AND TCU.classes_id = #{classesId}
--
Gitblit v1.8.0