Merge branch 'superb' of wuheng/eas-system into master

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) {

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>

controller/src/main/java/com/koobietech/eas/controller/EasArcTlsAttendanceController.java

@@ -0,0 +1,77 @@
+package com.koobietech.eas.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonPageResult;
+import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasArcTlsAttendance;
+import com.koobietech.eas.mbg.model.EasEduClassroom;
+import com.koobietech.eas.service.EasArcTlsAttendanceService;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/attendance")
+public class EasArcTlsAttendanceController {
+
+    @Resource
+    private EasArcTlsAttendanceService easArcTlsAttendanceService;
+
+    @GetMapping("/getStudentList")
+    @Operation(summary = "获取学生列表", description = "签到的时候会根据班级来获取学生列表（class_id）")
+    public JsonResult getStudentList(@RequestParam Long scheduleId) {
+        return JsonResult.data(easArcTlsAttendanceService.getStudentList(scheduleId));
+    }
+
+    @PostMapping("/query")
+    @Operation(summary = "查询签到记录", description = "前端构造查询条件，可以都为空，根据参数查询签到表信息（调用了分页组件）")
+    public JsonPageResult query(@RequestBody EasArcTlsAttendance attendance,
+                                @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        PageData ret = easArcTlsAttendanceService.query(attendance);
+        return JsonPageResult.data(ret);
+    }
+
+    @PostMapping("/add")
+    @Operation(summary = "添加签到记录", description = "用于添加签到信息")
+    public JsonResult add(@RequestBody EasArcTlsAttendance attendance) {
+        //增加的时候，加一个判断，如果已经存在，就转到更新方法（“/update”）
+        boolean isExist = easArcTlsAttendanceService.isExist(attendance);
+
+        if (isExist) {
+            System.out.println("！！！！！已经存在，转到更新方法");
+            return update(attendance);
+        }else{
+            System.out.println("！！！！！不存在，正在执行添加方法");
+            boolean isAdded = easArcTlsAttendanceService.add(attendance);
+            if (isAdded) {
+                return JsonResult.ok("添加签到记录成功");
+            }
+            return JsonResult.fail("添加签到记录失败");
+        }
+    }
+
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除签到记录", description = "删除签到记录数据根据时间和学员ID")
+    public JsonResult delete(@RequestBody EasArcTlsAttendance attendance) {
+        Boolean ret = easArcTlsAttendanceService.delete(attendance);
+        if (ret) {
+            return JsonResult.ok("删除签到记录成功");
+        }
+        return JsonResult.fail("删除签到记录失败");
+    }
+
+
+    @PutMapping("/update")
+    @Operation(summary = "更新签到记录", description = "更新签到记录")
+    public JsonResult update(@RequestBody EasArcTlsAttendance attendance) {
+        Boolean ret = easArcTlsAttendanceService.update(attendance);
+        if (ret) {
+            return JsonResult.ok("更新签到记录成功");
+        }
+        return JsonResult.fail("更新签到记录失败");
+    }
+}

controller/src/main/java/com/koobietech/eas/controller/EasArcTlsScoresController.java

@@ -0,0 +1,105 @@
+package com.koobietech.eas.controller;
+
+import cn.hutool.db.Page;
+import com.github.pagehelper.PageHelper;
+import com.koobietech.eas.common.result.JsonPageResult;
+import com.koobietech.eas.common.result.JsonResult;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasArcTlsScores;
+import com.koobietech.eas.service.EasArcTlsScoresService;
+import io.swagger.v3.core.util.Json;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+@RestController
+@Tag(name = "成绩控制器")
+public class EasArcTlsScoresController {
+
+    @Resource
+    EasArcTlsScoresService easArcTlsScoresService;
+
+    /**
+     * 添加学生成绩信息
+     * @param easArcTlsScores
+     * @return
+     */
+    @PostMapping(value = "/addStudentScore")
+    @Operation(summary = "添加学生成绩信息",description = "用于添加学生成绩信息")
+    public JsonResult addStudentScore(@RequestBody EasArcTlsScores easArcTlsScores) {
+        int i = easArcTlsScoresService.addStudentScore(easArcTlsScores);
+        System.out.println(i);
+        return JsonResult.ok("添加成功!");
+    }
+
+    /**
+     * 修改学生成绩信息
+     * @param easArcTlsScores
+     * @return
+     */
+    @PutMapping(value = "/updateStudentScore")
+    @Operation(summary = "修改学生成绩信息",description = "用于修改学生成绩信息")
+    public JsonResult updateStudentScore(@RequestBody EasArcTlsScores easArcTlsScores) {
+        int i = easArcTlsScoresService.updateStudentScore(easArcTlsScores);
+        if (i > 0){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+
+    /**
+     * 查询所有学生成绩信息
+     * @return
+     */
+    @GetMapping(value = "/selectAllStudentScores")
+    @Operation(summary = "查询所有学生的成绩信息",description = "用于查询所有学生的成绩信息")
+    public JsonResult selectAllStudentScores() {
+        List<EasArcTlsScores> easArcTlsScores = easArcTlsScoresService.selectAllStudentScores();
+        return JsonResult.data(easArcTlsScores);
+    }
+
+    /**
+     * 条件查询学生成绩信息
+     * @param easArcTlsScores
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping(value = "/selectScoreByExample")
+    @Operation(summary = "条件查询学生成绩信息",description = "用于条件查询学生成绩信息")
+    public JsonPageResult selectScoreByExample(@RequestBody EasArcTlsScores easArcTlsScores,
+                                               @RequestParam Integer pageNum,@RequestParam Integer pageSize){
+        PageHelper.startPage(pageNum,pageSize);
+        PageData pageData = easArcTlsScoresService.selectScoreByExample(easArcTlsScores);
+        return JsonPageResult.data(pageData);
+    }
+
+    @PostMapping(value = "/importExcelScores")
+    @Operation(summary = "Excel导入学生成绩信息",description = "用于Excel导入学生成绩信息")
+    public JsonResult importExcelScores(MultipartFile excelFile) {
+        InputStream inputStream = null;
+        Boolean aBoolean;
+        try {
+            inputStream = excelFile.getInputStream();
+            aBoolean = easArcTlsScoresService.importExcelScores(inputStream);
+        } catch (IOException e) {
+            aBoolean = false;
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {}
+        }
+        if (aBoolean == true){
+            return JsonResult.ok();
+        }else {
+            return JsonResult.fail();
+        }
+    }
+}

controller/src/main/resources/application-local.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8080
 spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false

controller/src/main/resources/application.yaml

@@ -2,7 +2,7 @@ server:
   port: 8081
 spring:
   profiles:
-    active: wheng
+    active: local
   main:
     allow-circular-references: true
   servlet:

dao/pom.xml

@@ -8,6 +8,10 @@
     <description>dao</description>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-wps</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>

dao/src/main/java/com/koobietech/eas/dao/Pojo/EasArcTlsScoresPojo.java

@@ -0,0 +1,41 @@
+package com.koobietech.eas.dao.Pojo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class EasArcTlsScoresPojo implements Serializable {
+    @Excel(name = "学员档案")
+    private String studentNumber;
+
+    @Excel(name = "类目ID" )
+    private Integer categoryId;
+
+    @Excel(name = "科目ID" )
+    private Integer subjectId;
+
+    @Excel(name = "考试时间" )
+    private Date testDate;
+
+    @Excel(name = "分数")
+    private BigDecimal score;
+
+    @Excel(name = "通过率")
+    private BigDecimal passRate;
+
+    @Excel(name = "及格率")
+    private BigDecimal excelRate;
+
+    @Excel(name = "创建时间", format = "yyyy-MM-dd")
+    private Date createTime;
+
+    @Excel(name = "考试备注信息")
+    private String comment;
+
+    private static final long serialVersionUID = 1L;
+
+}

dao/src/main/java/com/koobietech/eas/dao/attendancePojo.java

@@ -0,0 +1,6 @@
+package com.koobietech.eas.dao;
+
+public class attendancePojo {
+    private String student_name;
+
+}

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));
         }
     }
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);
+}

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;

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;
 
     /**

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;
 
     /**

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;
 
     /**
@@ -47,6 +49,14 @@ public class EasArcTlsAttendance implements Serializable {
     @Schema(description = "a  表示正常出勤,   b  表示迟到、早退, c  表示旷课, d  表示请假, e表示无效")
     private String afternoon;
 
+    /**
+     * 学员姓名
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "学员姓名")
+    private String studentName;
+
     /**
      * 学生档案号
      *
@@ -69,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;
 
     /**
@@ -77,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;
@@ -129,6 +141,14 @@ public class EasArcTlsAttendance implements Serializable {
         this.afternoon = afternoon;
     }
 
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
     public String getStudentNumber() {
         return studentNumber;
     }
@@ -173,6 +193,7 @@ public class EasArcTlsAttendance implements Serializable {
         sb.append(", month=").append(month);
         sb.append(", morning=").append(morning);
         sb.append(", afternoon=").append(afternoon);
+        sb.append(", studentName=").append(studentName);
         sb.append(", studentNumber=").append(studentNumber);
         sb.append(", createUid=").append(createUid);
         sb.append(", createTime=").append(createTime);

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsAttendanceExample.java

@@ -512,6 +512,76 @@ public class EasArcTlsAttendanceExample {
             return (Criteria) this;
         }
 
+        public Criteria andStudentNameIsNull() {
+            addCriterion("student_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameIsNotNull() {
+            addCriterion("student_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameEqualTo(String value) {
+            addCriterion("student_name =", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameNotEqualTo(String value) {
+            addCriterion("student_name <>", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameGreaterThan(String value) {
+            addCriterion("student_name >", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameGreaterThanOrEqualTo(String value) {
+            addCriterion("student_name >=", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameLessThan(String value) {
+            addCriterion("student_name <", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameLessThanOrEqualTo(String value) {
+            addCriterion("student_name <=", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameLike(String value) {
+            addCriterion("student_name like", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameNotLike(String value) {
+            addCriterion("student_name not like", value, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameIn(List<String> values) {
+            addCriterion("student_name in", values, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameNotIn(List<String> values) {
+            addCriterion("student_name not in", values, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameBetween(String value1, String value2) {
+            addCriterion("student_name between", value1, value2, "studentName");
+            return (Criteria) this;
+        }
+
+        public Criteria andStudentNameNotBetween(String value1, String value2) {
+            addCriterion("student_name not between", value1, value2, "studentName");
+            return (Criteria) this;
+        }
+
         public Criteria andStudentNumberIsNull() {
             addCriterion("student_number is null");
             return (Criteria) this;

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;
 
     /**

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsStudents.java

@@ -2,8 +2,6 @@ package com.koobietech.eas.mbg.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -54,7 +52,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生出生日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date birthdate;
 
     /**
@@ -87,7 +85,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生入学进入培训班日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date enrollmentDate;
 
     /**
@@ -96,7 +94,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生在培训班毕业日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date graduationDate;
 
     /**
@@ -137,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;
 
     /**
@@ -145,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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
@@ -29,7 +30,7 @@ public class EasEduSubjects implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学科分类")
-    private String categoryId;
+    private Integer categoryId;
 
     /**
      * 创建时间
@@ -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;
 
     /**
@@ -89,11 +92,11 @@ public class EasEduSubjects implements Serializable {
         this.description = description;
     }
 
-    public String getCategoryId() {
+    public Integer getCategoryId() {
         return categoryId;
     }
 
-    public void setCategoryId(String categoryId) {
+    public void setCategoryId(Integer categoryId) {
         this.categoryId = categoryId;
     }
 

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSubjectsExample.java

@@ -315,62 +315,52 @@ public class EasEduSubjectsExample {
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdEqualTo(String value) {
+        public Criteria andCategoryIdEqualTo(Integer value) {
             addCriterion("category_id =", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdNotEqualTo(String value) {
+        public Criteria andCategoryIdNotEqualTo(Integer value) {
             addCriterion("category_id <>", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdGreaterThan(String value) {
+        public Criteria andCategoryIdGreaterThan(Integer value) {
             addCriterion("category_id >", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdGreaterThanOrEqualTo(String value) {
+        public Criteria andCategoryIdGreaterThanOrEqualTo(Integer value) {
             addCriterion("category_id >=", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdLessThan(String value) {
+        public Criteria andCategoryIdLessThan(Integer value) {
             addCriterion("category_id <", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdLessThanOrEqualTo(String value) {
+        public Criteria andCategoryIdLessThanOrEqualTo(Integer value) {
             addCriterion("category_id <=", value, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdLike(String value) {
-            addCriterion("category_id like", value, "categoryId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryIdNotLike(String value) {
-            addCriterion("category_id not like", value, "categoryId");
-            return (Criteria) this;
-        }
-
-        public Criteria andCategoryIdIn(List<String> values) {
+        public Criteria andCategoryIdIn(List<Integer> values) {
             addCriterion("category_id in", values, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdNotIn(List<String> values) {
+        public Criteria andCategoryIdNotIn(List<Integer> values) {
             addCriterion("category_id not in", values, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdBetween(String value1, String value2) {
+        public Criteria andCategoryIdBetween(Integer value1, Integer value2) {
             addCriterion("category_id between", value1, value2, "categoryId");
             return (Criteria) this;
         }
 
-        public Criteria andCategoryIdNotBetween(String value1, String value2) {
+        public Criteria andCategoryIdNotBetween(Integer value1, Integer value2) {
             addCriterion("category_id not between", value1, value2, "categoryId");
             return (Criteria) this;
         }

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**

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;
 
     /**
@@ -63,12 +65,21 @@ public class EasSysStudent implements Serializable {
     @Schema(description = "学生密码")
     private String passwd;
 
+    /**
+     * 学员头像
+     *
+     * @mbg.generated
+     */
+    @Schema(description = "学员头像")
+    private String avatar;
+
     /**
      * 创建时间
      *
      * @mbg.generated
      */
     @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -77,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;
 
     /**
@@ -177,6 +189,14 @@ public class EasSysStudent implements Serializable {
         this.passwd = passwd;
     }
 
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -239,6 +259,7 @@ public class EasSysStudent implements Serializable {
         sb.append(", email=").append(email);
         sb.append(", enrollmentDate=").append(enrollmentDate);
         sb.append(", passwd=").append(passwd);
+        sb.append(", avatar=").append(avatar);
         sb.append(", createTime=").append(createTime);
         sb.append(", modifyTime=").append(modifyTime);
         sb.append(", admissionsId=").append(admissionsId);

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysStudentExample.java

@@ -672,6 +672,76 @@ public class EasSysStudentExample {
             return (Criteria) this;
         }
 
+        public Criteria andAvatarIsNull() {
+            addCriterion("avatar is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarIsNotNull() {
+            addCriterion("avatar is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarEqualTo(String value) {
+            addCriterion("avatar =", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotEqualTo(String value) {
+            addCriterion("avatar <>", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarGreaterThan(String value) {
+            addCriterion("avatar >", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarGreaterThanOrEqualTo(String value) {
+            addCriterion("avatar >=", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLessThan(String value) {
+            addCriterion("avatar <", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLessThanOrEqualTo(String value) {
+            addCriterion("avatar <=", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarLike(String value) {
+            addCriterion("avatar like", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotLike(String value) {
+            addCriterion("avatar not like", value, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarIn(List<String> values) {
+            addCriterion("avatar in", values, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotIn(List<String> values) {
+            addCriterion("avatar not in", values, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarBetween(String value1, String value2) {
+            addCriterion("avatar between", value1, value2, "avatar");
+            return (Criteria) this;
+        }
+
+        public Criteria andAvatarNotBetween(String value1, String value2) {
+            addCriterion("avatar not between", value1, value2, "avatar");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

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();
+    }
+}

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);
+        }
+    }
+}

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;
 
     /**

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasArcTlsAttendanceMapper.xml

@@ -8,6 +8,7 @@
     <result column="month" jdbcType="INTEGER" property="month" />
     <result column="morning" jdbcType="CHAR" property="morning" />
     <result column="afternoon" jdbcType="CHAR" property="afternoon" />
+    <result column="student_name" jdbcType="VARCHAR" property="studentName" />
     <result column="student_number" jdbcType="VARCHAR" property="studentNumber" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -72,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, checkin_date, schedule_id, month, morning, afternoon, student_number, create_uid, 
-    create_time, modify_time
+    id, checkin_date, schedule_id, month, morning, afternoon, student_name, student_number, 
+    create_uid, create_time, modify_time
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasArcTlsAttendanceExample" resultMap="BaseResultMap">
     select
@@ -110,13 +111,13 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into eas_arc_tls_attendance (checkin_date, schedule_id, month, 
-      morning, afternoon, student_number, 
-      create_uid, create_time, modify_time
-      )
+      morning, afternoon, student_name, 
+      student_number, create_uid, create_time, 
+      modify_time)
     values (#{checkinDate,jdbcType=DATE}, #{scheduleId,jdbcType=INTEGER}, #{month,jdbcType=INTEGER}, 
-      #{morning,jdbcType=CHAR}, #{afternoon,jdbcType=CHAR}, #{studentNumber,jdbcType=VARCHAR}, 
-      #{createUid,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}
-      )
+      #{morning,jdbcType=CHAR}, #{afternoon,jdbcType=CHAR}, #{studentName,jdbcType=VARCHAR}, 
+      #{studentNumber,jdbcType=VARCHAR}, #{createUid,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{modifyTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasArcTlsAttendance">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -139,6 +140,9 @@
       <if test="afternoon != null">
         afternoon,
       </if>
+      <if test="studentName != null">
+        student_name,
+      </if>
       <if test="studentNumber != null">
         student_number,
       </if>
@@ -168,6 +172,9 @@
       <if test="afternoon != null">
         #{afternoon,jdbcType=CHAR},
       </if>
+      <if test="studentName != null">
+        #{studentName,jdbcType=VARCHAR},
+      </if>
       <if test="studentNumber != null">
         #{studentNumber,jdbcType=VARCHAR},
       </if>
@@ -209,6 +216,9 @@
       <if test="record.afternoon != null">
         afternoon = #{record.afternoon,jdbcType=CHAR},
       </if>
+      <if test="record.studentName != null">
+        student_name = #{record.studentName,jdbcType=VARCHAR},
+      </if>
       <if test="record.studentNumber != null">
         student_number = #{record.studentNumber,jdbcType=VARCHAR},
       </if>
@@ -234,6 +244,7 @@
       month = #{record.month,jdbcType=INTEGER},
       morning = #{record.morning,jdbcType=CHAR},
       afternoon = #{record.afternoon,jdbcType=CHAR},
+      student_name = #{record.studentName,jdbcType=VARCHAR},
       student_number = #{record.studentNumber,jdbcType=VARCHAR},
       create_uid = #{record.createUid,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -260,6 +271,9 @@
       <if test="afternoon != null">
         afternoon = #{afternoon,jdbcType=CHAR},
       </if>
+      <if test="studentName != null">
+        student_name = #{studentName,jdbcType=VARCHAR},
+      </if>
       <if test="studentNumber != null">
         student_number = #{studentNumber,jdbcType=VARCHAR},
       </if>
@@ -282,6 +296,7 @@
       month = #{month,jdbcType=INTEGER},
       morning = #{morning,jdbcType=CHAR},
       afternoon = #{afternoon,jdbcType=CHAR},
+      student_name = #{studentName,jdbcType=VARCHAR},
       student_number = #{studentNumber,jdbcType=VARCHAR},
       create_uid = #{createUid,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasEduSubjectsMapper.xml

@@ -5,7 +5,7 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="category_id" jdbcType="VARCHAR" property="categoryId" />
+    <result column="category_id" jdbcType="INTEGER" property="categoryId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="create_uid" jdbcType="INTEGER" property="createUid" />
@@ -109,7 +109,7 @@
     insert into eas_edu_subjects (name, description, category_id, 
       create_time, modify_time, create_uid, 
       disabled)
-    values (#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, 
+    values (#{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{categoryId,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{createUid,jdbcType=INTEGER}, 
       #{disabled,jdbcType=CHAR})
   </insert>
@@ -149,7 +149,7 @@
         #{description,jdbcType=VARCHAR},
       </if>
       <if test="categoryId != null">
-        #{categoryId,jdbcType=VARCHAR},
+        #{categoryId,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
@@ -184,7 +184,7 @@
         description = #{record.description,jdbcType=VARCHAR},
       </if>
       <if test="record.categoryId != null">
-        category_id = #{record.categoryId,jdbcType=VARCHAR},
+        category_id = #{record.categoryId,jdbcType=INTEGER},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -208,7 +208,7 @@
     set id = #{record.id,jdbcType=INTEGER},
       name = #{record.name,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      category_id = #{record.categoryId,jdbcType=VARCHAR},
+      category_id = #{record.categoryId,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{record.createUid,jdbcType=INTEGER},
@@ -227,7 +227,7 @@
         description = #{description,jdbcType=VARCHAR},
       </if>
       <if test="categoryId != null">
-        category_id = #{categoryId,jdbcType=VARCHAR},
+        category_id = #{categoryId,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -248,7 +248,7 @@
     update eas_edu_subjects
     set name = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      category_id = #{categoryId,jdbcType=VARCHAR},
+      category_id = #{categoryId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       create_uid = #{createUid,jdbcType=INTEGER},

mbg/src/main/resources/com/koobietech/eas/mbg/mapper/EasSysStudentMapper.xml

@@ -10,6 +10,7 @@
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="enrollment_date" jdbcType="DATE" property="enrollmentDate" />
     <result column="passwd" jdbcType="VARCHAR" property="passwd" />
+    <result column="avatar" jdbcType="VARCHAR" property="avatar" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime" />
     <result column="admissions_id" jdbcType="INTEGER" property="admissionsId" />
@@ -77,7 +78,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, student_number, student_name, gender, phone, email, enrollment_date, passwd, 
-    create_time, modify_time, admissions_id, manager_id, create_uid, disabled
+    avatar, create_time, modify_time, admissions_id, manager_id, create_uid, disabled
   </sql>
   <select id="selectByExample" parameterType="com.koobietech.eas.mbg.model.EasSysStudentExample" resultMap="BaseResultMap">
     select
@@ -115,14 +116,14 @@
     </selectKey>
     insert into eas_sys_student (student_number, student_name, gender, 
       phone, email, enrollment_date, 
-      passwd, create_time, modify_time, 
-      admissions_id, manager_id, create_uid, 
-      disabled)
+      passwd, avatar, create_time, 
+      modify_time, admissions_id, manager_id, 
+      create_uid, disabled)
     values (#{studentNumber,jdbcType=VARCHAR}, #{studentName,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR}, 
       #{phone,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{enrollmentDate,jdbcType=DATE}, 
-      #{passwd,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, 
-      #{admissionsId,jdbcType=INTEGER}, #{managerId,jdbcType=INTEGER}, #{createUid,jdbcType=INTEGER}, 
-      #{disabled,jdbcType=CHAR})
+      #{passwd,jdbcType=VARCHAR}, #{avatar,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{modifyTime,jdbcType=TIMESTAMP}, #{admissionsId,jdbcType=INTEGER}, #{managerId,jdbcType=INTEGER}, 
+      #{createUid,jdbcType=INTEGER}, #{disabled,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.koobietech.eas.mbg.model.EasSysStudent">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -151,6 +152,9 @@
       <if test="passwd != null">
         passwd,
       </if>
+      <if test="avatar != null">
+        avatar,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -192,6 +196,9 @@
       <if test="passwd != null">
         #{passwd,jdbcType=VARCHAR},
       </if>
+      <if test="avatar != null">
+        #{avatar,jdbcType=VARCHAR},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -245,6 +252,9 @@
       <if test="record.passwd != null">
         passwd = #{record.passwd,jdbcType=VARCHAR},
       </if>
+      <if test="record.avatar != null">
+        avatar = #{record.avatar,jdbcType=VARCHAR},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -278,6 +288,7 @@
       email = #{record.email,jdbcType=VARCHAR},
       enrollment_date = #{record.enrollmentDate,jdbcType=DATE},
       passwd = #{record.passwd,jdbcType=VARCHAR},
+      avatar = #{record.avatar,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       modify_time = #{record.modifyTime,jdbcType=TIMESTAMP},
       admissions_id = #{record.admissionsId,jdbcType=INTEGER},
@@ -312,6 +323,9 @@
       <if test="passwd != null">
         passwd = #{passwd,jdbcType=VARCHAR},
       </if>
+      <if test="avatar != null">
+        avatar = #{avatar,jdbcType=VARCHAR},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -342,6 +356,7 @@
       email = #{email,jdbcType=VARCHAR},
       enrollment_date = #{enrollmentDate,jdbcType=DATE},
       passwd = #{passwd,jdbcType=VARCHAR},
+      avatar = #{avatar,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       admissions_id = #{admissionsId,jdbcType=INTEGER},

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>

service/pom.xml

@@ -8,6 +8,10 @@
     <description>service</description>
 
     <dependencies>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>

service/src/main/java/com/koobietech/eas/service/EasArcTlsAttendanceService.java

@@ -0,0 +1,20 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasArcTlsAttendance;
+
+import java.util.List;
+
+public interface EasArcTlsAttendanceService {
+    PageData query(EasArcTlsAttendance attendance);
+
+    Boolean add(EasArcTlsAttendance attendance);
+
+    Boolean delete(EasArcTlsAttendance attendance);
+
+    Boolean update(EasArcTlsAttendance attendance);
+
+    boolean isExist(EasArcTlsAttendance attendance);
+
+    List<EasArcTlsAttendance> getStudentList(Long scheduleId);
+}

service/src/main/java/com/koobietech/eas/service/EasArcTlsScoresService.java

@@ -0,0 +1,22 @@
+package com.koobietech.eas.service;
+
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.model.EasArcTlsScores;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.util.List;
+
+public interface EasArcTlsScoresService {
+
+    int addStudentScore(EasArcTlsScores easArcTlsScores);
+
+    int updateStudentScore(EasArcTlsScores easArcTlsScores);
+
+    List<EasArcTlsScores> selectAllStudentScores();
+
+    PageData selectScoreByExample(EasArcTlsScores easArcTlsScores);
+
+    Boolean importExcelScores(InputStream inputStream);
+
+}

service/src/main/java/com/koobietech/eas/service/impl/EasArcTlsAttendanceServiceImpl.java

@@ -0,0 +1,212 @@
+package com.koobietech.eas.service.impl;
+
+import com.koobietech.eas.common.exception.EasException;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.mbg.mapper.EasArcTlsAttendanceMapper;
+import com.koobietech.eas.mbg.mapper.EasEduCltRelationMapper;
+import com.koobietech.eas.mbg.mapper.EasEduScheduleMapper;
+import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
+import com.koobietech.eas.mbg.model.*;
+import com.koobietech.eas.service.EasArcTlsAttendanceService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class EasArcTlsAttendanceServiceImpl implements EasArcTlsAttendanceService {
+
+    @Resource
+    private EasArcTlsAttendanceMapper easArcTlsAttendanceMapper;
+
+    @Resource
+    private EasEduCltRelationMapper easEduCltRelationMapper;
+
+    @Resource
+    private EasSysStudentMapper easSysStudentMapper;
+
+    @Resource
+    private EasEduScheduleMapper easEduScheduleMapper;
+
+
+    @Override
+    public PageData query(EasArcTlsAttendance attendance) {
+        EasArcTlsAttendanceExample easArcTlsAttendanceExample = new EasArcTlsAttendanceExample();
+        EasArcTlsAttendanceExample.Criteria criteria = easArcTlsAttendanceExample.createCriteria();
+        if (Objects.nonNull(attendance)) {
+
+            if (Objects.nonNull(attendance.getId()) && attendance.getId() != 0) {
+                criteria.andIdEqualTo(attendance.getId());
+            }
+            if (Objects.nonNull(attendance.getCheckinDate())) {
+                criteria.andCheckinDateEqualTo(attendance.getCheckinDate());
+            }
+            if (Objects.nonNull(attendance.getScheduleId()) && attendance.getScheduleId() != 0) {
+                criteria.andScheduleIdEqualTo(attendance.getScheduleId());
+            }
+            if (Objects.nonNull(attendance.getMonth()) && attendance.getMonth() != 0) {
+                criteria.andMonthEqualTo(attendance.getMonth());
+            }
+            if (StringUtils.hasText(attendance.getMorning())) {
+                criteria.andMorningEqualTo(attendance.getMorning());
+            }
+            if (StringUtils.hasText(attendance.getAfternoon())) {
+                criteria.andAfternoonEqualTo(attendance.getAfternoon());
+            }
+            if (StringUtils.hasText(attendance.getStudentNumber())) {
+                criteria.andStudentNumberLike("%" + attendance.getStudentNumber() + "%");
+            }
+            if (Objects.nonNull(attendance.getCreateUid()) && attendance.getCreateUid() != 0) {
+                criteria.andCreateUidEqualTo(attendance.getCreateUid());
+            }
+            if (Objects.nonNull(attendance.getCreateTime())) {
+                criteria.andCreateTimeEqualTo(attendance.getCreateTime());
+            }
+            if (Objects.nonNull(attendance.getModifyTime())) {
+                criteria.andModifyTimeEqualTo(attendance.getModifyTime());
+            }
+        }
+
+        List<EasArcTlsAttendance> easArcTlsAttendances =
+                easArcTlsAttendanceMapper.selectByExample(easArcTlsAttendanceExample);
+        long l = easArcTlsAttendanceMapper.countByExample(easArcTlsAttendanceExample);
+        PageData ret = new PageData();
+        ret.setData(easArcTlsAttendances);
+        ret.setTotal(l);
+        return ret;
+
+    }
+
+    @Override
+    public Boolean add(EasArcTlsAttendance attendance) {
+        //签到日期前端会自己传 所以就不需要再写一次了
+        attendance.setCreateTime(new Date());
+        attendance.setModifyTime(new Date());
+        return easArcTlsAttendanceMapper.insert(attendance) == 1;
+
+    }
+
+    @Override
+    public Boolean delete(EasArcTlsAttendance attendance) {
+        //虽然接收的是对象，但是后端是根据checkin_date和student_number来删除的
+        EasArcTlsAttendanceExample easArcTlsAttendanceExample = new EasArcTlsAttendanceExample();
+        EasArcTlsAttendanceExample.Criteria criteria = easArcTlsAttendanceExample.createCriteria();
+        if (Objects.nonNull(attendance)) {
+            if (Objects.nonNull(attendance.getCheckinDate())
+                    && StringUtils.hasText(attendance.getStudentNumber())) {
+                criteria.andCheckinDateEqualTo(attendance.getCheckinDate());
+                criteria.andStudentNumberEqualTo(attendance.getStudentNumber());
+                return easArcTlsAttendanceMapper.deleteByExample(easArcTlsAttendanceExample) == 1;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public Boolean update(EasArcTlsAttendance attendance) {
+        attendance.setModifyTime(new Date());
+        return easArcTlsAttendanceMapper.updateByPrimaryKey(attendance) == 1;
+    }
+
+    @Override
+    public boolean isExist(EasArcTlsAttendance attendance) {
+        EasArcTlsAttendanceExample easArcTlsAttendanceExample = new EasArcTlsAttendanceExample();
+        EasArcTlsAttendanceExample.Criteria criteria = easArcTlsAttendanceExample.createCriteria();
+        if (Objects.nonNull(attendance)) {
+            if (Objects.nonNull(attendance.getCheckinDate())
+                    && StringUtils.hasText(attendance.getStudentNumber())) {
+                criteria.andCheckinDateEqualTo(attendance.getCheckinDate());
+                criteria.andStudentNumberEqualTo(attendance.getStudentNumber());
+                return easArcTlsAttendanceMapper.countByExample(easArcTlsAttendanceExample) == 1;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public List<EasArcTlsAttendance> getStudentList(Long scheduleId) {
+        // 根据课表ID查找EasEduSchedule表，获取班级ID
+        EasEduSchedule easEduSchedule = easEduScheduleMapper.selectByPrimaryKey(scheduleId);
+        Long classId = Optional.ofNullable(easEduSchedule)
+                .map(s -> Long.valueOf(s.getClassId()))
+                .orElseThrow(() -> new EasException("未查询到对应课表，请检查数据库", 9595));
+
+        // 根据班级ID查找EasEduCltRelation表，获取学生ID列表
+        EasEduCltRelationExample easEduCltRelationExample = new EasEduCltRelationExample();
+        easEduCltRelationExample.createCriteria().andClassIdEqualTo(classId);
+
+        // 查询EasEduCltRelation表，获取符合条件的学生ID列表
+        List<Long> studentIds = easEduCltRelationMapper.selectByExample(easEduCltRelationExample)
+                .stream()
+                .map(r -> Long.valueOf(r.getStudentId()))
+                .collect(Collectors.toList());
+
+        // 根据学生ID列表查询EasSysStudent表，获取学生信息
+        EasSysStudentExample easSysStudentExample = new EasSysStudentExample();
+        easSysStudentExample.createCriteria().andIdIn(studentIds);
+        List<EasSysStudent> easSysStudents = easSysStudentMapper.selectByExample(easSysStudentExample);
+
+        // 封装查询结果到PageData对象并返回
+        return easSysStudents.stream()
+                .map(s -> {
+                    EasArcTlsAttendance easArcTlsAttendance = new EasArcTlsAttendance();
+                    easArcTlsAttendance.setStudentNumber(s.getStudentNumber());
+                    easArcTlsAttendance.setStudentName(s.getStudentName());
+                    return easArcTlsAttendance;
+                })
+                .collect(Collectors.toList());
+    }
+
+
+//    @Override
+//    public List<EasArcTlsAttendance> getStudentList(Long scheduleId) {
+//        // 创建查询条件，根据课表ID查找EasEduSchedule表，获取班级ID
+//        EasEduSchedule easEduSchedule = easEduScheduleMapper.selectByPrimaryKey(scheduleId);
+//        if (Objects.nonNull(easEduSchedule)) {
+//            Long classId = Long.valueOf(easEduSchedule.getClassId()); // 将班级ID赋值给classId变量
+//            System.out.println("！！！！查出来的对应scheduleId的classId = " + classId);
+//
+//            // 创建查询条件，根据班级ID查找EasEduCltRelation表，获取学生ID
+//            EasEduCltRelationExample easEduCltRelationExample = new EasEduCltRelationExample();
+//            EasEduCltRelationExample.Criteria criteriaFindStuId = easEduCltRelationExample.createCriteria();
+//            criteriaFindStuId.andClassIdEqualTo(classId); // 设置班级ID作为查询条件
+//
+//            // 查询EasEduCltRelation表，获取符合条件的学生ID列表
+//            List<EasEduCltRelation> easEduCltRelations = easEduCltRelationMapper.selectByExample(easEduCltRelationExample);
+//            List<Long> studentIds = new ArrayList<>();
+//            for (EasEduCltRelation easEduCltRelation : easEduCltRelations) {
+//                studentIds.add(Long.valueOf(easEduCltRelation.getStudentId())); // 将学生ID添加到列表中
+//            }
+//
+//            // 根据学生ID列表查询EasSysStudent表，获取学生信息
+//            EasSysStudentExample easSysStudentExample = new EasSysStudentExample();
+//            EasSysStudentExample.Criteria criteriaFindStu = easSysStudentExample.createCriteria();
+//            if (!studentIds.isEmpty()) {
+//                criteriaFindStu.andIdIn(studentIds); // 设置学生ID列表作为查询条件
+//            }
+//            List<EasSysStudent> easSysStudents = easSysStudentMapper.selectByExample(easSysStudentExample);
+//
+//            // 封装查询结果到PageData对象并返回
+//            PageData ret = new PageData();
+//            ret.setData(easSysStudents);
+//            List<EasArcTlsAttendance> list = new ArrayList<>();
+//            easSysStudents.forEach(easSysStudent -> {
+//                EasArcTlsAttendance easArcTlsAttendance = new EasArcTlsAttendance();
+//                easArcTlsAttendance.setStudentNumber(easSysStudent.getStudentNumber());
+//                easArcTlsAttendance.setStudentName(easSysStudent.getStudentName());
+//                list.add(easArcTlsAttendance);
+//            });
+//            return list;
+//        } else {
+//            throw new EasException("未查询到对应课表，请检查数据库", 9595); // 如果查询不到课表，则返回空列表
+//        }
+//    }
+
+
+}
+
+
+
+

service/src/main/java/com/koobietech/eas/service/impl/EasArcTlsScoresServiceImpl.java

@@ -0,0 +1,113 @@
+package com.koobietech.eas.service.impl;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.core.bean.BeanUtil;
+import com.koobietech.eas.common.result.PageData;
+import com.koobietech.eas.dao.Pojo.EasArcTlsScoresPojo;
+import com.koobietech.eas.mbg.mapper.EasArcTlsScoresMapper;
+import com.koobietech.eas.mbg.model.EasArcTlsScores;
+import com.koobietech.eas.mbg.model.EasArcTlsScoresExample;
+import com.koobietech.eas.service.EasArcTlsScoresService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class EasArcTlsScoresServiceImpl implements EasArcTlsScoresService {
+
+    @Resource
+    EasArcTlsScoresMapper easArcTlsScoresMapper;
+
+
+    @Override
+    public int addStudentScore(EasArcTlsScores easArcTlsScores) {
+        easArcTlsScores.setCreateTime(new Date());
+        easArcTlsScores.setModifyTime(new Date());
+        return easArcTlsScoresMapper.insert(easArcTlsScores);
+    }
+
+    @Override
+    public int updateStudentScore(EasArcTlsScores easArcTlsScores) {
+        return easArcTlsScoresMapper.updateByPrimaryKey(easArcTlsScores);
+    }
+
+    @Override
+    public List<EasArcTlsScores> selectAllStudentScores() {
+        return easArcTlsScoresMapper.selectByExample(null);
+    }
+
+    @Override
+    public PageData selectScoreByExample(EasArcTlsScores easArcTlsScores) {
+        EasArcTlsScoresExample easArcTlsScoresExample = new EasArcTlsScoresExample();
+        EasArcTlsScoresExample.Criteria criteria = easArcTlsScoresExample.createCriteria();
+        if (Objects.nonNull(easArcTlsScores)){
+            if (Objects.nonNull(easArcTlsScores.getId())) {
+                criteria.andIdEqualTo(easArcTlsScores.getId());
+            }
+            if (StringUtils.hasText(easArcTlsScores.getStudentNumber())) {
+                criteria.andStudentNumberLike("%"+easArcTlsScores.getStudentNumber()+"%");
+            }
+            if (Objects.nonNull(easArcTlsScores.getTestDate())) {
+                criteria.andTestDateGreaterThan(easArcTlsScores.getTestDate());
+            }
+            if (Objects.nonNull(easArcTlsScores.getScore())) {
+                criteria.andScoreEqualTo(easArcTlsScores.getScore());
+            }
+            if (Objects.nonNull(easArcTlsScores.getPassRate())) {
+                criteria.andPassRateEqualTo(easArcTlsScores.getPassRate());
+            }
+            if (Objects.nonNull(easArcTlsScores.getExcelRate())) {
+                criteria.andExcelRateEqualTo(easArcTlsScores.getExcelRate());
+            }
+            if (Objects.nonNull(easArcTlsScores.getCreateTime())) {
+                criteria.andCreateTimeGreaterThan(easArcTlsScores.getCreateTime());
+            }
+            if (Objects.nonNull(easArcTlsScores.getModifyTime())) {
+                criteria.andCreateTimeGreaterThan(easArcTlsScores.getModifyTime());
+            }
+            if (Objects.nonNull(easArcTlsScores.getCreateUid())) {
+                criteria.andCreateUidEqualTo(easArcTlsScores.getCreateUid());
+            }
+            if (StringUtils.hasText(easArcTlsScores.getComment())) {
+                criteria.andCommentLike("%"+easArcTlsScores.getComment()+"%");
+            }
+        }
+        List<EasArcTlsScores> easArcTlsScores1 = easArcTlsScoresMapper.selectByExample(easArcTlsScoresExample);
+        long l = easArcTlsScoresMapper.countByExample(easArcTlsScoresExample);
+        return PageData.init(easArcTlsScores1,l);
+    }
+
+        @Override
+    public Boolean importExcelScores(InputStream inputStream) {
+            ImportParams params = new ImportParams();
+            params.setTitleRows(1);
+            params.setHeadRows(1);
+            try {
+                List<EasArcTlsScoresPojo> score = ExcelImportUtil.importExcel(
+                        inputStream, EasArcTlsScoresPojo.class, params);
+                for ( EasArcTlsScoresPojo easArcTlsScoresPojo : score) {
+                    if ( easArcTlsScoresPojo.getScore() == null
+                            || easArcTlsScoresPojo.getScore().equals("") ) {
+                        continue;
+                    }
+                    easArcTlsScoresPojo.setCreateTime(new Date());
+                    EasArcTlsScores easArcTlsScores = new EasArcTlsScores();
+                    BeanUtil.copyProperties(easArcTlsScoresPojo, easArcTlsScores);
+                    easArcTlsScoresMapper.insert(easArcTlsScores);
+                }
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            return true;
+    }
+
+}

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;
@@ -22,7 +23,7 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
     private static final Logger LOGGER = LoggerFactory.getLogger(EasStuProfileServiceImpl.class);
     private static final String TEMPLATE_PATH = "temp/StuRegistTemp.docx";
     private static final String PHOTO_PATH = "temp/kun.jpeg";
-    private static final String OUTPUT_PATH = "C:\\Users\\lc\\Desktop\\test.docx";
+    private static final String OUTPUT_PATH = "D:\\myDesk\\test.docx";
 
     @Override
     public JsonResult StuProfileDownload(EasArcTlsStudents easArcTlsStudents) {
@@ -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);