From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java | 82 +++++++++++++----------------------------
1 files changed, 26 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
index e36ffce..3d4423e 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/ExamTemplatesVO.java
@@ -1,81 +1,51 @@
package com.mindskip.xzs.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mindskip.xzs.base.BasePage;
-import com.mindskip.xzs.domain.ExamTemplates;
-import com.mindskip.xzs.domain.ExamTemplatesSubject;
+import lombok.Data;
import java.io.Serializable;
-import java.util.Arrays;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
+@Data
public class ExamTemplatesVO extends BasePage implements Serializable {
private Integer id;
+
private String name;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ctime;
+ private LocalDateTime now;
+
private Integer[] subjectId;
+
+ /** 璇剧洰鍚嶅瓧 */
+ private String subjectNames;
+
private String status;
+
private Integer userId;
- public Integer getId() {
- return id;
- }
+ /**
+ * 閮ㄩ棬ID
+ */
+ private List<Integer> deptId;
- public void setId(Integer id) {
- this.id = id;
- }
+ private List<Integer> userIds;
- public String getName() {
- return name;
- }
+ private List<Integer> paperIds;
- public void setName(String name) {
- this.name = name;
- }
+ private String createDepartment;
- public Date getCtime() {
- return ctime;
- }
+ private Integer createUser;
- public void setCtime(Date ctime) {
- this.ctime = ctime;
- }
+ /**
+ * 鏃堕棿鍛ㄦ湡
+ */
+ private List<LocalDateTime> period;
- public Integer[] getSubjectId() {
- return subjectId;
- }
-
- public void setSubjectId(Integer[] subjectId) {
- this.subjectId = subjectId;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- @Override
- public String toString() {
- return "ExamTemplatesVO{" +
- "id=" + id +
- ", name='" + name + '\'' +
- ", ctime=" + ctime +
- ", subjectId=" + Arrays.toString(subjectId) +
- ", status=" + status +
- ", userId=" + userId +
- '}';
- }
}
--
Gitblit v1.8.0