Merge remote-tracking branch 'origin/master'

EricsHu

2023-02-28 660b072b084f3f765ff8bfcb1abdd7f1cd9ed068

 src/main/java/com/qxueyou/scc/teach/student/model/StuStudent.java

@@ -28,11 +28,19 @@
   private static final long serialVersionUID = 7504161189427721559L;
   
   /*
    * 状态: 已报名
    * 状态: 已报名
    */
   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;