Sfoglia il codice sorgente

胡乱地切换各个业务中。。。。

superb 1 anno fa
parent
commit
3663474106
48 ha cambiato i file con 717 aggiunte e 13 eliminazioni
  1. 2 2
      common/src/main/java/com/koobietech/eas/common/utils/StudentArchiveGenerator.java
  2. 11 11
      controller/pom.xml
  3. BIN
      controller/src/main/resources/temp/StuRegistTemp.docx
  4. BIN
      controller/src/main/resources/temp/~$uRegistTemp.docx
  5. 7 0
      mbg/src/main/java/com/koobietech/eas/mbg/CommentGenerator.java
  6. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcArchivesMapper.java
  7. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcArctypeMapper.java
  8. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsAttendanceMapper.java
  9. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsScoresMapper.java
  10. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsStudentsMapper.java
  11. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduCategoryMapper.java
  12. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClaRelationMapper.java
  13. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClassMapper.java
  14. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClassroomMapper.java
  15. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduCltRelationMapper.java
  16. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduScheduleMapper.java
  17. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduSubjectsMapper.java
  18. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysDepRelationMapper.java
  19. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysDepartmentMapper.java
  20. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysLogsMapper.java
  21. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPermissionMapper.java
  22. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPesRelationMapper.java
  23. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysStudentMapper.java
  24. 32 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysUniversityMapper.java
  25. 1 0
      mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysUserinfoMapper.java
  26. 5 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArchives.java
  27. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArctype.java
  28. 4 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsAttendance.java
  29. 4 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsScores.java
  30. 6 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsStudents.java
  31. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCategory.java
  32. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClaRelation.java
  33. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClass.java
  34. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClassroom.java
  35. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCltRelation.java
  36. 5 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSchedule.java
  37. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSubjects.java
  38. 2 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepRelation.java
  39. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepartment.java
  40. 2 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysLogs.java
  41. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPermission.java
  42. 2 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPesRelation.java
  43. 4 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysStudent.java
  44. 54 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUniversity.java
  45. 339 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUniversityExample.java
  46. 3 0
      mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUserinfo.java
  47. 164 0
      mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysUniversityMapper.xml
  48. 25 0
      service/src/main/java/com/koobietech/eas/service/impl/EasStuProfileServiceImpl.java

+ 2 - 2
common/src/main/java/com/koobietech/eas/common/utils/StudentArchiveGenerator.java

@@ -15,8 +15,8 @@ public class StudentArchiveGenerator {
     private static final int STUDENT_CODE_LENGTH = 25;
     private static final int STUDENT_NUM_LENGTH = 8;
 
-    public  static String generateArchiveCode(String studentNumber, String fileTypeCode) {
-        String studentNum = studentNumber.substring(2, STUDENT_NUM_LENGTH + 3).replace("X", "");
+    public  static String generateArchiveCode(String generateStudentCode, String fileTypeCode) {
+        String studentNum = generateStudentCode.substring(2, STUDENT_NUM_LENGTH + 3).replace("X", "");
         String nowDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHhmmss", Locale.CHINA));
         String archiveCode = ARCHIVE_CODE_PREFIX + studentNum + nowDate + fileTypeCode;
         if (archiveCode.length() < ARCHIVE_CODE_LENGTH) {

+ 11 - 11
controller/pom.xml

@@ -83,17 +83,17 @@
     <build>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.png</include>
-                    <include>**/*.jpeg</include>
-                    <include>**/*.xml</include>
-                    <include>**/*.docx</include>
-                    <include>**/*.xlsx</include>
-                    <include>**/*.yaml</include>
-                    <include>**/*.properties</include>
-                </includes>
+<!--                <directory>src/main/resources</directory>-->
+<!--                <filtering>true</filtering>-->
+<!--                <includes>-->
+<!--                    <include>**/*.png</include>-->
+<!--                    <include>**/*.jpeg</include>-->
+<!--                    <include>**/*.xml</include>-->
+<!--                    <include>**/*.docx</include>-->
+<!--                    <include>**/*.xlsx</include>-->
+<!--                    <include>**/*.yaml</include>-->
+<!--                    <include>**/*.properties</include>-->
+<!--                </includes>-->
             </resource>
         </resources>
         <plugins>

BIN
controller/src/main/resources/temp/StuRegistTemp.docx


BIN
controller/src/main/resources/temp/~$uRegistTemp.docx


+ 7 - 0
mbg/src/main/java/com/koobietech/eas/mbg/CommentGenerator.java

@@ -18,6 +18,8 @@ public class CommentGenerator extends DefaultCommentGenerator {
     private static final String EXAMPLE_SUFFIX="Example";
     private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.v3.oas.annotations.media.Schema";
 
+    private static final String COM_FASTERXML_JACKSON_NAME="com.fasterxml.jackson.annotation.JsonFormat";
+
     /**
      * 设置用户配置的参数
      */
@@ -43,6 +45,10 @@ public class CommentGenerator extends DefaultCommentGenerator {
             }
             //给model的字段添加swagger注解
             field.addJavaDocLine("@Schema(description = \""+remarks+"\")");
+            //如果字段是时间类型 则加JsonFormat注解
+            if("java.util.Date".equals(field.getType().getFullyQualifiedName())){
+                field.addJavaDocLine("@JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")");
+            }
         }
     }
 
@@ -67,6 +73,7 @@ public class CommentGenerator extends DefaultCommentGenerator {
         //只在model中添加swagger注解类的导入
         if(!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
             compilationUnit.addImportedType(new FullyQualifiedJavaType(API_MODEL_PROPERTY_FULL_CLASS_NAME));
+            compilationUnit.addImportedType(new FullyQualifiedJavaType(COM_FASTERXML_JACKSON_NAME));
         }
     }
 }

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcArchivesMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasArcArchives;
 import com.koobietech.eas.mbg.model.EasArcArchivesExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcArctypeMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasArcArctype;
 import com.koobietech.eas.mbg.model.EasArcArctypeExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsAttendanceMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasArcTlsAttendance;
 import com.koobietech.eas.mbg.model.EasArcTlsAttendanceExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsScoresMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasArcTlsScores;
 import com.koobietech.eas.mbg.model.EasArcTlsScoresExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasArcTlsStudentsMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasArcTlsStudents;
 import com.koobietech.eas.mbg.model.EasArcTlsStudentsExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduCategoryMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasEduCategory;
 import com.koobietech.eas.mbg.model.EasEduCategoryExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClaRelationMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasEduClaRelation;
 import com.koobietech.eas.mbg.model.EasEduClaRelationExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClassMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasEduClass;
 import com.koobietech.eas.mbg.model.EasEduClassExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduClassroomMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasEduClassroom;
 import com.koobietech.eas.mbg.model.EasEduClassroomExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduCltRelationMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasEduCltRelation;
 import com.koobietech.eas.mbg.model.EasEduCltRelationExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduScheduleMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasEduSchedule;
 import com.koobietech.eas.mbg.model.EasEduScheduleExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasEduSubjectsMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasEduSubjects;
 import com.koobietech.eas.mbg.model.EasEduSubjectsExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysDepRelationMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasSysDepRelation;
 import com.koobietech.eas.mbg.model.EasSysDepRelationExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysDepartmentMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 import com.koobietech.eas.mbg.model.EasSysDepartmentExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysLogsMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasSysLogs;
 import com.koobietech.eas.mbg.model.EasSysLogsExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPermissionMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 import com.koobietech.eas.mbg.model.EasSysPermissionExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysPesRelationMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasSysPesRelation;
 import com.koobietech.eas.mbg.model.EasSysPesRelationExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysStudentMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.mbg.model.EasSysStudentExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 32 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysUniversityMapper.java

@@ -0,0 +1,32 @@
+package com.koobietech.eas.mbg.mapper;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.koobietech.eas.mbg.model.EasSysUniversity;
+import com.koobietech.eas.mbg.model.EasSysUniversityExample;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface EasSysUniversityMapper {
+    long countByExample(EasSysUniversityExample example);
+
+    int deleteByExample(EasSysUniversityExample example);
+
+    int deleteByPrimaryKey(String universityCode);
+
+    int insert(EasSysUniversity record);
+
+    int insertSelective(EasSysUniversity record);
+
+    List<EasSysUniversity> selectByExample(EasSysUniversityExample example);
+
+    EasSysUniversity selectByPrimaryKey(String universityCode);
+
+    int updateByExampleSelective(@Param("record") EasSysUniversity record, @Param("example") EasSysUniversityExample example);
+
+    int updateByExample(@Param("record") EasSysUniversity record, @Param("example") EasSysUniversityExample example);
+
+    int updateByPrimaryKeySelective(EasSysUniversity record);
+
+    int updateByPrimaryKey(EasSysUniversity record);
+}

+ 1 - 0
mbg/src/main/java/com/koobietech/eas/mbg/mapper/EasSysUserinfoMapper.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.mapper;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.mbg.model.EasSysUserinfoExample;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 5 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArchives.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -45,6 +46,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -53,6 +55,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -61,6 +64,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "档案有效期截至时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date validityTime;
 
     /**
@@ -77,6 +81,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "档案创建时间, 用于文件归档用")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArctype.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -53,6 +54,7 @@ public class EasArcArctype implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -61,6 +63,7 @@ public class EasArcArctype implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 4 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsAttendance.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -13,6 +14,7 @@ public class EasArcTlsAttendance implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "签到日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date checkinDate;
 
     /**
@@ -77,6 +79,7 @@ public class EasArcTlsAttendance implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -85,6 +88,7 @@ public class EasArcTlsAttendance implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     private static final long serialVersionUID = 1L;

+ 4 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsScores.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -44,6 +45,7 @@ public class EasArcTlsScores implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "考试时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date testDate;
 
     /**
@@ -76,6 +78,7 @@ public class EasArcTlsScores implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -84,6 +87,7 @@ public class EasArcTlsScores implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 6 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsStudents.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -51,6 +52,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生出生日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date birthdate;
 
     /**
@@ -83,6 +85,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生入学进入培训班日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date enrollmentDate;
 
     /**
@@ -91,6 +94,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生在培训班毕业日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date graduationDate;
 
     /**
@@ -131,6 +135,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -139,6 +144,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCategory.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -29,6 +30,7 @@ public class EasEduCategory implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -37,6 +39,7 @@ public class EasEduCategory implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClaRelation.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -45,6 +46,7 @@ public class EasEduClaRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -53,6 +55,7 @@ public class EasEduClaRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClass.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -43,6 +44,7 @@ public class EasEduClass implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -51,6 +53,7 @@ public class EasEduClass implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClassroom.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -77,6 +78,7 @@ public class EasEduClassroom implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -85,6 +87,7 @@ public class EasEduClassroom implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCltRelation.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -29,6 +30,7 @@ public class EasEduCltRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -37,6 +39,7 @@ public class EasEduCltRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 5 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSchedule.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -21,6 +22,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "起始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
 
     /**
@@ -29,6 +31,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
     /**
@@ -85,6 +88,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -93,6 +97,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSubjects.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -37,6 +38,7 @@ public class EasEduSubjects implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -45,6 +47,7 @@ public class EasEduSubjects implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 2 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepRelation.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -43,6 +44,7 @@ public class EasSysDepRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepartment.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -53,6 +54,7 @@ public class EasSysDepartment implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -61,6 +63,7 @@ public class EasSysDepartment implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 2 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysLogs.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -19,6 +20,7 @@ public class EasSysLogs implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "记录日志的时间戳")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date timestamp;
 
     /**

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPermission.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -43,6 +44,7 @@ public class EasSysPermission implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -51,6 +53,7 @@ public class EasSysPermission implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 2 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPesRelation.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -35,6 +36,7 @@ public class EasSysPesRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**

+ 4 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysStudent.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -53,6 +54,7 @@ public class EasSysStudent implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生入学日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date enrollmentDate;
 
     /**
@@ -77,6 +79,7 @@ public class EasSysStudent implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -85,6 +88,7 @@ public class EasSysStudent implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 54 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUniversity.java

@@ -0,0 +1,54 @@
+package com.koobietech.eas.mbg.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.Serializable;
+
+public class EasSysUniversity implements Serializable {
+    /**
+     * 大学编码
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "大学编码")
+    private String universityCode;
+
+    /**
+     * 学校名
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "学校名")
+    private String universityTitle;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getUniversityCode() {
+        return universityCode;
+    }
+
+    public void setUniversityCode(String universityCode) {
+        this.universityCode = universityCode;
+    }
+
+    public String getUniversityTitle() {
+        return universityTitle;
+    }
+
+    public void setUniversityTitle(String universityTitle) {
+        this.universityTitle = universityTitle;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", universityCode=").append(universityCode);
+        sb.append(", universityTitle=").append(universityTitle);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 339 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUniversityExample.java

@@ -0,0 +1,339 @@
+package com.koobietech.eas.mbg.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EasSysUniversityExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EasSysUniversityExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andUniversityCodeIsNull() {
+            addCriterion("university_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeIsNotNull() {
+            addCriterion("university_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeEqualTo(String value) {
+            addCriterion("university_code =", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeNotEqualTo(String value) {
+            addCriterion("university_code <>", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeGreaterThan(String value) {
+            addCriterion("university_code >", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("university_code >=", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeLessThan(String value) {
+            addCriterion("university_code <", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeLessThanOrEqualTo(String value) {
+            addCriterion("university_code <=", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeLike(String value) {
+            addCriterion("university_code like", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeNotLike(String value) {
+            addCriterion("university_code not like", value, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeIn(List<String> values) {
+            addCriterion("university_code in", values, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeNotIn(List<String> values) {
+            addCriterion("university_code not in", values, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeBetween(String value1, String value2) {
+            addCriterion("university_code between", value1, value2, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityCodeNotBetween(String value1, String value2) {
+            addCriterion("university_code not between", value1, value2, "universityCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleIsNull() {
+            addCriterion("university_title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleIsNotNull() {
+            addCriterion("university_title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleEqualTo(String value) {
+            addCriterion("university_title =", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleNotEqualTo(String value) {
+            addCriterion("university_title <>", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleGreaterThan(String value) {
+            addCriterion("university_title >", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("university_title >=", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleLessThan(String value) {
+            addCriterion("university_title <", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleLessThanOrEqualTo(String value) {
+            addCriterion("university_title <=", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleLike(String value) {
+            addCriterion("university_title like", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleNotLike(String value) {
+            addCriterion("university_title not like", value, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleIn(List<String> values) {
+            addCriterion("university_title in", values, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleNotIn(List<String> values) {
+            addCriterion("university_title not in", values, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleBetween(String value1, String value2) {
+            addCriterion("university_title between", value1, value2, "universityTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andUniversityTitleNotBetween(String value1, String value2) {
+            addCriterion("university_title not between", value1, value2, "universityTitle");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 3 - 0
mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUserinfo.java

@@ -1,5 +1,6 @@
 package com.koobietech.eas.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 import java.util.Date;
@@ -67,6 +68,7 @@ public class EasSysUserinfo implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -75,6 +77,7 @@ public class EasSysUserinfo implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

+ 164 - 0
mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysUniversityMapper.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.koobietech.eas.mbg.mapper.EasSysUniversityMapper">
+  <resultMap id="BaseResultMap" type="com.koobietech.eas.mbg.model.EasSysUniversity">
+    <id column="university_code" jdbcType="VARCHAR" property="universityCode" />
+    <result column="university_title" jdbcType="VARCHAR" property="universityTitle" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    university_code, university_title
+  </sql>
+  <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysUniversityExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from eas_sys_university
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from eas_sys_university
+    where university_code = #{universityCode,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from eas_sys_university
+    where university_code = #{universityCode,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.koobietech.eas.mbg.model.EasSysUniversityExample">
+    delete from eas_sys_university
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.koobietech.eas.mbg.model.EasSysUniversity">
+    insert into eas_sys_university (university_code, university_title)
+    values (#{universityCode,jdbcType=VARCHAR}, #{universityTitle,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysUniversity">
+    insert into eas_sys_university
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="universityCode != null">
+        university_code,
+      </if>
+      <if test="universityTitle != null">
+        university_title,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="universityCode != null">
+        #{universityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="universityTitle != null">
+        #{universityTitle,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.koobietech.eas.mbg.model.EasSysUniversityExample" resultType="java.lang.Long">
+    select count(*) from eas_sys_university
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update eas_sys_university
+    <set>
+      <if test="record.universityCode != null">
+        university_code = #{record.universityCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.universityTitle != null">
+        university_title = #{record.universityTitle,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update eas_sys_university
+    set university_code = #{record.universityCode,jdbcType=VARCHAR},
+      university_title = #{record.universityTitle,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.koobietech.eas.mbg.model.EasSysUniversity">
+    update eas_sys_university
+    <set>
+      <if test="universityTitle != null">
+        university_title = #{universityTitle,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where university_code = #{universityCode,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.koobietech.eas.mbg.model.EasSysUniversity">
+    update eas_sys_university
+    set university_title = #{universityTitle,jdbcType=VARCHAR}
+    where university_code = #{universityCode,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 25 - 0
service/src/main/java/com/koobietech/eas/service/impl/EasStuProfileServiceImpl.java

@@ -1,6 +1,7 @@
 package com.koobietech.eas.service.impl;
 
 import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.utils.StudentArchiveGenerator;
 import com.koobietech.eas.mbg.model.EasArcTlsStudents;
 import com.koobietech.eas.service.EasStuProfileService;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -45,6 +46,30 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
             System.out.println( photo );
             map.put("avatar", photo);
 
+            /**
+             public static String generateStudentCode(String studentNumber, String studentId, String schoolName, String enrollmentDate) {
+             LocalDate localDateEnrollmentDate = LocalDate.of(Integer.parseInt(enrollmentDate), 1, 1);
+             String studentAge = String.valueOf(getStudentAge(studentId));
+             String studentNum = getStudentNum(studentNumber);
+             String studentGender = getStudentGender(studentId).substring(0, 1); // 取性别代码的首字母
+             String graduationDate = String.valueOf(getStudentGraduationDate(localDateEnrollmentDate).getYear());
+
+             String studentCode = STUDENT_CODE_PEREFIX + studentNum + studentAge +
+             studentGender + graduationDate + schoolName;
+
+             // 如果生成的档案编码长度不足,用UUID填充
+             if (studentCode.length() < STUDENT_CODE_LENGTH) {
+             studentCode += UUID.randomUUID().toString()
+             .substring(0, STUDENT_CODE_LENGTH - studentCode.length());
+             }
+             return studentCode;
+             }
+             */
+            //使用工具类生成学员档案号
+            String student_number = StudentArchiveGenerator.generateStudentCode(
+                    "", "232126199003194781", "11273", "2023");
+
+
             replacePlaceholders(doc, map);
 
             saveDocument(doc);