From 660b072b084f3f765ff8bfcb1abdd7f1cd9ed068 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期二, 28 二月 2023 14:24:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java b/src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java
index 46262c5..690e1f4 100644
--- a/src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java
+++ b/src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java
@@ -33,6 +33,14 @@
public static final String STATUS_REGISTER = "register";
public static final String STATUS_ACTIVE = "active";
public static final String STATUS_DEACTIVE = "deactive";
+ public static final String STATUS_GRADUATED = "graduated";
+
+ /**
+ * 鐘舵�侊細鏃疯锛屾湭鎵撳崱锛屽凡鎵撳崱
+ */
+ public static final String STATUS_TRUANCY = "truancy";
+ public static final String STATUS_NO_CLOCKING = "noClocking";
+ public static final String STATUS_PUNCHE = "punched";
private String studentId;
private Date createTime;
@@ -55,6 +63,7 @@
private BigDecimal score;
private String studentNumber;
private String attendanceStatus;
+ private String graduationText;
public StuStudent() {
}
@@ -72,7 +81,7 @@
public StuStudent(String studentId, Date createTime, Date updateTime, String creator, String createId,
String updator, String updateId, boolean deleteFlag, String userId, String name, String classId,
- String tenantId, String status, String attendanceStatus,String studentNumber) {
+ String tenantId, String status, String attendanceStatus, String graduationText,String studentNumber) {
this.studentId = studentId;
this.createTime = createTime;
this.updateTime = updateTime;
@@ -87,6 +96,7 @@
this.tenantId = tenantId;
this.status = status;
this.attendanceStatus = attendanceStatus;
+ this.graduationText = graduationText;
this.studentNumber=studentNumber;
}
@@ -224,6 +234,15 @@
this.attendanceStatus = attendanceStatus;
}
+ @Column(name = "GRADUATION_TEXT", length = 200)
+ public String getGraduationText() {
+ return this.graduationText;
+ }
+
+ public void setGraduationText(String graduationText) {
+ this.graduationText = graduationText;
+ }
+
@Column(name = "STUDENT_NO", length = 32)
public String getStudentNo() {
return studentNo;
--
Gitblit v1.8.0