Merge remote-tracking branch 'origin/master'

EricsHu

2023-11-24 3a27392dc23193ae839526efd779f36589bc91cc

 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,24 +63,36 @@
   private BigDecimal score;
   private String studentNumber;
   private String attendanceStatus;
   private String graduationText;
   private String comment;
   //照片
   private String photo;
   //护照名
   private String passporName;
   //国籍
   private String nationality;
   //祖籍地
   private String ancestralHome;
   //出生日期
   private String birthday;
   //出生地
   private String birthplace;
   //是否港澳台侨
   private String chinaStatus;
   //户口详细地址
   private String registeredAddress;
   //家庭详细地址
   private String homeAddress;
   //宗教信仰
   private String religiousBelief;
   //邮箱地址
   private String email;
   //工作单位
   private String workUnit;
   //毕业去向
   private String graduationDestination;

   public StuStudent() {
   }

   public StuStudent(String studentId, Date createTime, Date updateTime, String creator, String createId,
         boolean deleteFlag,String studentNumber) {
      this.studentId = studentId;
      this.createTime = createTime;
      this.updateTime = updateTime;
      this.creator = creator;
      this.createId = createId;
      this.deleteFlag = deleteFlag;
      this.studentNumber=studentNumber;
   }

   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) {
   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 subjectId, String tenantId, String status, String studentNo, boolean sex, String mobilePhone, BigDecimal studyDuration, BigDecimal score, String studentNumber, String attendanceStatus, String graduationText, String comment, String photo, String passporName, String nationality, String ancestralHome, String birthday, String birthplace, String chinaStatus, String registeredAddress, String homeAddress, String religiousBelief, String email, String workUnit, String graduationDestination) {
      this.studentId = studentId;
      this.createTime = createTime;
      this.updateTime = updateTime;
@@ -84,10 +104,34 @@
      this.userId = userId;
      this.name = name;
      this.classId = classId;
      this.subjectId = subjectId;
      this.tenantId = tenantId;
      this.status = status;
      this.studentNo = studentNo;
      this.sex = sex;
      this.mobilePhone = mobilePhone;
      this.studyDuration = studyDuration;
      this.score = score;
      this.studentNumber = studentNumber;
      this.attendanceStatus = attendanceStatus;
      this.studentNumber=studentNumber;
      this.graduationText = graduationText;
      this.comment = comment;
      this.photo = photo;
      this.passporName = passporName;
      this.nationality = nationality;
      this.ancestralHome = ancestralHome;
      this.birthday = birthday;
      this.birthplace = birthplace;
      this.chinaStatus = chinaStatus;
      this.registeredAddress = registeredAddress;
      this.homeAddress = homeAddress;
      this.religiousBelief = religiousBelief;
      this.email = email;
      this.workUnit = workUnit;
      this.graduationDestination = graduationDestination;
   }

   public StuStudent() {
   }

   @Id
@@ -224,6 +268,23 @@
      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 = "COMMENT", length = 200)
   public String getComment() {
      return this.comment;
   }
   public void setComment(String comment) {
      this.comment = comment;
   }

   @Column(name = "STUDENT_NO", length = 32)
   public String getStudentNo() {
      return studentNo;
@@ -287,4 +348,120 @@
      this.studentNumber = studentNumber;
   }

   @Column(name = "PHOTO", length = 50)
   public String getPhoto() {
      return photo;
   }

   public void setPhoto(String photo) {
      this.photo = photo;
   }

   @Column(name = "PASSPORT_NAME", length = 100)
   public String getPassporName() {
      return passporName;
   }

   public void setPassporName(String passporName) {
      this.passporName = passporName;
   }

   @Column(name = "NATIONALITY", length = 32)
   public String getNationality() {
      return nationality;
   }

   public void setNationality(String nationality) {
      this.nationality = nationality;
   }

   @Column(name = "ANCESTRAL_HOME", length = 50)
   public String getAncestralHome() {
      return ancestralHome;
   }

   public void setAncestralHome(String ancestralHome) {
      this.ancestralHome = ancestralHome;
   }

   @Column(name = "BIRTHDAY", length = 50)
   public String getBirthday() {
      return birthday;
   }

   public void setBirthday(String birthday) {
      this.birthday = birthday;
   }

   @Column(name = "BIRTHPLACE", length = 50)
   public String getBirthplace() {
      return birthplace;
   }

   public void setBirthplace(String birthplace) {
      this.birthplace = birthplace;
   }

   @Column(name = "CHINA_STATUS", length = 16)
   public String getChinaStatus() {
      return chinaStatus;
   }

   public void setChinaStatus(String chinaStatus) {
      this.chinaStatus = chinaStatus;
   }

   @Column(name = "REGISTERED_ADDRESS", length = 50)
   public String getRegisteredAddress() {
      return registeredAddress;
   }

   public void setRegisteredAddress(String registeredAddress) {
      this.registeredAddress = registeredAddress;
   }

   @Column(name = "HOME_ADDRESS", length = 50)
   public String getHomeAddress() {
      return homeAddress;
   }

   public void setHomeAddress(String homeAddress) {
      this.homeAddress = homeAddress;
   }

   @Column(name = "RELIGIOUS_BELIEF", length = 150)
   public String getReligiousBelief() {
      return religiousBelief;
   }

   public void setReligiousBelief(String religiousBelief) {
      this.religiousBelief = religiousBelief;
   }

   @Column(name = "EMAIL", length = 32)
   public String getEmail() {
      return email;
   }

   public void setEmail(String email) {
      this.email = email;
   }

   @Column(name = "WORK_UNIT", length = 32)
   public String getWorkUnit() {
      return workUnit;
   }

   public void setWorkUnit(String workUnit) {
      this.workUnit = workUnit;
   }

   @Column(name = "GRADUATION_DESTINATION", length = 32)
   public String getGraduationDestination() {
      return graduationDestination;
   }

   public void setGraduationDestination(String graduationDestination) {
      this.graduationDestination = graduationDestination;
   }
}