From 8853292babb2ad94de4a3207966f1e83b767cd2d Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:38:34 +0800
Subject: [PATCH] 新增流程节点进程查询接口
---
src/main/java/org/springblade/modules/exam/entity/ExamPaper.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
index 5b24b78..527a61f 100644
--- a/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
+++ b/src/main/java/org/springblade/modules/exam/entity/ExamPaper.java
@@ -16,13 +16,18 @@
*/
package org.springblade.modules.exam.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -31,40 +36,114 @@
* @author Chill
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("blade_notice")
-public class ExamPaper extends TenantEntity {
+@TableName("ksxt_exam")
+public class ExamPaper implements Serializable {
private static final long serialVersionUID = 1L;
/**
- * 标题
+ * ID
*/
- @ApiModelProperty(value = "标题")
- private String title;
+ @ApiModelProperty(value = "id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
- * 通知类型
+ * 考试名称
*/
- @ApiModelProperty(value = "通知类型")
- private Integer category;
+ private String examName;
/**
- * 发布日期
+ * 考试类型 1 正式考试 2：模拟考试
*/
- @ApiModelProperty(value = "发布日期")
- private Date releaseTime;
+ private Integer examType;
/**
- * 内容
+ * 注意事项
*/
- @ApiModelProperty(value = "内容")
- private String content;
+ private String examAttention;
/**
- * 单位id
+ * 考试开始时间
*/
- @TableField("dept_id")
- private Long deptId;
+ private Date startTime;
+
+ /**
+ * 考试结束时间
+ */
+ private Date endTime;
+
+ /**
+ * 时间区间
+ */
+ private String examTime;
+
+ /**
+ * 总分
+ */
+ private String totalScore;
+
+ /**
+ * 状态
+ */
+ private Integer examStatus;
+
+ /**
+ * 创建人
+ */
+ private String creator;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date creatorDate;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 培训考试id
+ */
+ @TableField("train_exam_id")
+ private Long trainExamId;
+
+ /**
+ * 审核状态 1：通过 2：不通过 3:待审核
+ */
+ @TableField("audit_status")
+ private Integer auditStatus;
+
+ /**
+ * 审核明细
+ */
+ @TableField("audit_detail")
+ private String auditDetail;
+
+ /**
+ * 审核时间
+ */
+ @TableField("audit_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date auditTime;
+
+ /**
+ * 考试人员确认确认人
+ */
+ @TableField("confirm_user")
+ private String confirmUser;
+
+ /**
+ * 确认时间
+ */
+ @TableField("confirm_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date confirmTime;
+
}
--
Gitblit v1.9.3