Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application.yml

@@ -139,6 +139,7 @@ security:
     - /system/xiaoYuanInfo/**
     - /xiaoYuan/notice/**
     - /system/dict/data/type/**
+    - /resource/oss/upload
 
 # 多租户配置
 tenant:

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ClassUtils.java

@@ -0,0 +1,36 @@
+package org.dromara.common.core.utils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+public class ClassUtils {
+
+    public static <T, S> T copyProperties(S source, T target) throws Exception {
+        Class<?> sourceClass = source.getClass();
+        Class<?> targetClass = target.getClass();
+
+        Field[] sourceFields = sourceClass.getDeclaredFields();
+        for (Field sourceField : sourceFields) {
+            if (Modifier.isFinal(sourceField.getModifiers())){
+                continue;
+            }
+            String fieldName = sourceField.getName();
+            Field targetField = null;
+            try {
+                targetField = targetClass.getDeclaredField(fieldName);
+            } catch (NoSuchFieldException e) {
+                // 目标对象不存在该属性，忽略
+                continue;
+            }
+
+            sourceField.setAccessible(true);
+            targetField.setAccessible(true);
+
+            Object value = sourceField.get(source);
+            targetField.set(target, value);
+        }
+
+        return target;
+    }
+
+}

ruoyi-common/ruoyi-common-oss/pom.xml

@@ -26,6 +26,11 @@
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-tenant</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentInfoController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.info;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.StudentInfoVo;
+import org.dromara.system.domain.bo.StudentInfoBo;
+import org.dromara.system.service.IStudentInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学生档案信息
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/student/info")
+public class StudentInfoController extends BaseController {
+
+    private final IStudentInfoService studentInfoService;
+
+    /**
+     * 查询学生档案信息列表
+     */
+    @SaCheckPermission("student:info:list")
+    @GetMapping("/list")
+    public TableDataInfo<StudentInfoVo> list(StudentInfoBo bo, PageQuery pageQuery) {
+        return studentInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学生档案信息列表
+     */
+    @SaCheckPermission("student:info:export")
+    @Log(title = "学生档案信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(StudentInfoBo bo, HttpServletResponse response) {
+        List<StudentInfoVo> list = studentInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学生档案信息", StudentInfoVo.class, response);
+    }
+
+    /**
+     * 获取学生档案信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("student:info:query")
+    @GetMapping("/{id}")
+    public R<StudentInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(studentInfoService.queryById(id));
+    }
+
+    /**
+     * 新增学生档案信息
+     */
+    @SaCheckPermission("student:info:add")
+    @Log(title = "学生档案信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StudentInfoBo bo) {
+        return toAjax(studentInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学生档案信息
+     */
+    @SaCheckPermission("student:info:edit")
+    @Log(title = "学生档案信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StudentInfoBo bo) {
+        return toAjax(studentInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学生档案信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("student:info:remove")
+    @Log(title = "学生档案信息", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(studentInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentInfoOldController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.info;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.StudentInfoOldVo;
+import org.dromara.system.domain.bo.StudentInfoOldBo;
+import org.dromara.system.service.IStudentInfoOldService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学生档案历史信息
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/infoOld")
+public class StudentInfoOldController extends BaseController {
+
+    private final IStudentInfoOldService studentInfoOldService;
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    @SaCheckPermission("system:infoOld:list")
+    @GetMapping("/list")
+    public TableDataInfo<StudentInfoOldVo> list(StudentInfoOldBo bo, PageQuery pageQuery) {
+        return studentInfoOldService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学生档案历史信息列表
+     */
+    @SaCheckPermission("system:infoOld:export")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(StudentInfoOldBo bo, HttpServletResponse response) {
+        List<StudentInfoOldVo> list = studentInfoOldService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学生档案历史信息", StudentInfoOldVo.class, response);
+    }
+
+    /**
+     * 获取学生档案历史信息详细信息
+     *
+     * @param oldId 主键
+     */
+    @SaCheckPermission("system:infoOld:query")
+    @GetMapping("/{oldId}")
+    public R<StudentInfoOldVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long oldId) {
+        return R.ok(studentInfoOldService.queryById(oldId));
+    }
+
+    /**
+     * 新增学生档案历史信息
+     */
+    @SaCheckPermission("system:infoOld:add")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StudentInfoOldBo bo) {
+        return toAjax(studentInfoOldService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学生档案历史信息
+     */
+    @SaCheckPermission("system:infoOld:edit")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StudentInfoOldBo bo) {
+        return toAjax(studentInfoOldService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学生档案历史信息
+     *
+     * @param oldIds 主键串
+     */
+    @SaCheckPermission("system:infoOld:remove")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{oldIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] oldIds) {
+        return toAjax(studentInfoOldService.deleteWithValidByIds(List.of(oldIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentLiveOldController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.info;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.StudentLiveOldVo;
+import org.dromara.system.domain.bo.StudentLiveOldBo;
+import org.dromara.system.service.IStudentLiveOldService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学生生活历史信息
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/liveOld")
+public class StudentLiveOldController extends BaseController {
+
+    private final IStudentLiveOldService studentLiveOldService;
+
+    /**
+     * 查询学生生活历史信息列表
+     */
+    @SaCheckPermission("system:liveOld:list")
+    @GetMapping("/list")
+    public TableDataInfo<StudentLiveOldVo> list(StudentLiveOldBo bo, PageQuery pageQuery) {
+        return studentLiveOldService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学生生活历史信息列表
+     */
+    @SaCheckPermission("system:liveOld:export")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(StudentLiveOldBo bo, HttpServletResponse response) {
+        List<StudentLiveOldVo> list = studentLiveOldService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学生生活历史信息", StudentLiveOldVo.class, response);
+    }
+
+    /**
+     * 获取学生生活历史信息详细信息
+     *
+     * @param liveId 主键
+     */
+    @SaCheckPermission("system:liveOld:query")
+    @GetMapping("/{liveId}")
+    public R<StudentLiveOldVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long liveId) {
+        return R.ok(studentLiveOldService.queryById(liveId));
+    }
+
+    /**
+     * 新增学生生活历史信息
+     */
+    @SaCheckPermission("system:liveOld:add")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StudentLiveOldBo bo) {
+        return toAjax(studentLiveOldService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学生生活历史信息
+     */
+    @SaCheckPermission("system:liveOld:edit")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StudentLiveOldBo bo) {
+        return toAjax(studentLiveOldService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学生生活历史信息
+     *
+     * @param liveIds 主键串
+     */
+    @SaCheckPermission("system:liveOld:remove")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{liveIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] liveIds) {
+        return toAjax(studentLiveOldService.deleteWithValidByIds(List.of(liveIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentMindOldController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.info;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.StudentMindOldVo;
+import org.dromara.system.domain.bo.StudentMindOldBo;
+import org.dromara.system.service.IStudentMindOldService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 学生心理健康历史信息
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/mindOld")
+public class StudentMindOldController extends BaseController {
+
+    private final IStudentMindOldService studentMindOldService;
+
+    /**
+     * 查询学生心理健康历史信息列表
+     */
+    @SaCheckPermission("system:mindOld:list")
+    @GetMapping("/list")
+    public TableDataInfo<StudentMindOldVo> list(StudentMindOldBo bo, PageQuery pageQuery) {
+        return studentMindOldService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学生心理健康历史信息列表
+     */
+    @SaCheckPermission("system:mindOld:export")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(StudentMindOldBo bo, HttpServletResponse response) {
+        List<StudentMindOldVo> list = studentMindOldService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学生心理健康历史信息", StudentMindOldVo.class, response);
+    }
+
+    /**
+     * 获取学生心理健康历史信息详细信息
+     *
+     * @param mindId 主键
+     */
+    @SaCheckPermission("system:mindOld:query")
+    @GetMapping("/{mindId}")
+    public R<StudentMindOldVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long mindId) {
+        return R.ok(studentMindOldService.queryById(mindId));
+    }
+
+    /**
+     * 新增学生心理健康历史信息
+     */
+    @SaCheckPermission("system:mindOld:add")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody StudentMindOldBo bo) {
+        return toAjax(studentMindOldService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学生心理健康历史信息
+     */
+    @SaCheckPermission("system:mindOld:edit")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody StudentMindOldBo bo) {
+        return toAjax(studentMindOldService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学生心理健康历史信息
+     *
+     * @param mindIds 主键串
+     */
+    @SaCheckPermission("system:mindOld:remove")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{mindIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] mindIds) {
+        return toAjax(studentMindOldService.deleteWithValidByIds(List.of(mindIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/TeacherInfoController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.info;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.domain.vo.TeacherInfoVo;
+import org.dromara.system.domain.bo.TeacherInfoBo;
+import org.dromara.system.service.ITeacherInfoService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 老师档案信息
+ *
+ * @author boman
+ * @date 2023-08-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/teacher/info")
+public class TeacherInfoController extends BaseController {
+
+    private final ITeacherInfoService teacherInfoService;
+
+    /**
+     * 查询老师档案信息列表
+     */
+    @SaCheckPermission("teacher:info:list")
+    @GetMapping("/list")
+    public TableDataInfo<TeacherInfoVo> list(TeacherInfoBo bo, PageQuery pageQuery) {
+        return teacherInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出老师档案信息列表
+     */
+    @SaCheckPermission("teacher:info:export")
+    @Log(title = "老师档案信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TeacherInfoBo bo, HttpServletResponse response) {
+        List<TeacherInfoVo> list = teacherInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "老师档案信息", TeacherInfoVo.class, response);
+    }
+
+    /**
+     * 获取老师档案信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("teacher:info:query")
+    @GetMapping("/{id}")
+    public R<TeacherInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(teacherInfoService.queryById(id));
+    }
+
+    /**
+     * 新增老师档案信息
+     */
+    @SaCheckPermission("teacher:info:add")
+    @Log(title = "老师档案信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TeacherInfoBo bo) {
+        return toAjax(teacherInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改老师档案信息
+     */
+    @SaCheckPermission("teacher:info:edit")
+    @Log(title = "老师档案信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TeacherInfoBo bo) {
+        return toAjax(teacherInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除老师档案信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("teacher:info:remove")
+    @Log(title = "老师档案信息", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(teacherInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterParentsController.java

@@ -71,7 +71,6 @@ public class RegisterParentsController extends BaseController {
     /**
      * 新增注册-家长
      */
-    @SaCheckPermission("register:parents:add")
     @Log(title = "注册-家长", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterSchoolController.java

@@ -72,7 +72,6 @@ public class RegisterSchoolController extends BaseController {
     /**
      * 新增注册-学校
      */
-    @SaCheckPermission("register:school:add")
     @Log(title = "注册-学校", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterTeacherController.java

@@ -39,7 +39,6 @@ public class RegisterTeacherController extends BaseController {
     /**
      * 查询注册-老师列表
      */
-    @SaCheckPermission("register:teacher:list")
     @GetMapping("/list")
     public TableDataInfo<RegisterTeacherVo> list(RegisterTeacherBo bo, PageQuery pageQuery) {
         return registerTeacherService.queryPageList(bo, pageQuery);
@@ -71,7 +70,6 @@ public class RegisterTeacherController extends BaseController {
     /**
      * 新增注册-老师
      */
-    @SaCheckPermission("register:teacher:add")
     @Log(title = "注册-老师", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +80,6 @@ public class RegisterTeacherController extends BaseController {
     /**
      * 修改注册-老师
      */
-    @SaCheckPermission("register:teacher:edit")
     @Log(title = "注册-老师", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentInfo.java

@@ -0,0 +1,206 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学生档案信息对象 student_info
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("student_info")
+public class StudentInfo extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 名族
+     */
+    private String familyName;
+
+    /**
+     * 学校
+     */
+    private String school;
+
+    /**
+     * 学号
+     */
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 是否近视（1：是，2：否）
+     */
+    private String isNearsightedness;
+
+    /**
+     * 近视度数
+     */
+    private String degreeMyopia;
+
+    /**
+     * 是否远视（1：是，2：否）
+     */
+    private String isFarsightedness;
+
+    /**
+     * 远视度数
+     */
+    private String farsightedness;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 血型
+     */
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    private String politicalStatus;
+
+    /**
+     * 健康状况
+     */
+    private String health;
+
+    /**
+     * 心理状况
+     */
+    private String mind;
+
+    /**
+     * 证件照(地址)
+     */
+    private String identificationPhoto;
+
+    /**
+     * 门禁照(地址)
+     */
+    private String entrancePermit;
+
+    /**
+     * 紧急联系人
+     */
+    private String emergencyContact;
+
+    /**
+     * 紧急联系人手机号
+     */
+    private String emergencyContactTelephone;
+
+    /**
+     * 父亲
+     */
+    private String fatherName;
+
+    /**
+     * 父亲联系方式
+     */
+    private String fatherTelephone;
+
+    /**
+     * 母亲
+     */
+    private String motherName;
+
+    /**
+     * 母亲联系方式
+     */
+    private String motherTelephone;
+
+    /**
+     * 居住地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 有无过往病史（1：有，2：无）
+     */
+    private String isMedicalHistory;
+
+    /**
+     * 病史描述
+     */
+    private String medicalDescription;
+
+    /**
+     * 心里健康描述
+     */
+    private String psychologicalDescription;
+
+    /**
+     * 留守儿童（1：是，2：否）
+     */
+    private String isLset;
+
+    /**
+     * 是否贫困
+     */
+    private String isPoverty;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentInfoOld.java

@@ -0,0 +1,206 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学生档案历史信息对象 student_info_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("student_info_old")
+public class StudentInfoOld extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "old_id")
+    private Long oldId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 名族
+     */
+    private String familyName;
+
+    /**
+     * 学校
+     */
+    private String school;
+
+    /**
+     * 学号
+     */
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 是否近视（1：是，2：否）
+     */
+    private String isNearsightedness;
+
+    /**
+     * 近视度数
+     */
+    private String degreeMyopia;
+
+    /**
+     * 是否远视（1：是，2：否）
+     */
+    private String isFarsightedness;
+
+    /**
+     * 远视度数
+     */
+    private String farsightedness;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 血型
+     */
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    private String politicalStatus;
+
+    /**
+     * 健康状况
+     */
+    private String health;
+
+    /**
+     * 证件照(地址)
+     */
+    private String identificationPhoto;
+
+    /**
+     * 心理状况
+     */
+    private String mind;
+
+    /**
+     * 门禁照(地址)
+     */
+    private String entrancePermit;
+
+    /**
+     * 父亲
+     */
+    private String fatherName;
+
+    /**
+     * 父亲联系方式
+     */
+    private String fatherTelephone;
+
+    /**
+     * 母亲
+     */
+    private String motherName;
+
+    /**
+     * 母亲联系方式
+     */
+    private String motherTelephone;
+
+    /**
+     * 居住地址
+     */
+    private String address;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 有无过往病史（1：有，2：无）
+     */
+    private String isMedicalHistory;
+
+    /**
+     * 病史描述
+     */
+    private String medicalDescription;
+
+    /**
+     * 心理健康描述
+     */
+    private String psychologicalDescription;
+
+    /**
+     * 留守儿童（1：是，2：否）
+     */
+    private String isLset;
+
+    /**
+     * 是否贫困（1：是，2：否）
+     */
+    private String isPoverty;
+
+    /**
+     * 紧急联系人
+     */
+    private String emergencyContact;
+
+    /**
+     * 紧急联系人手机号
+     */
+    private String emergencyContactTelephone;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentLiveOld.java

@@ -0,0 +1,86 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学生生活历史信息对象 student_live_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("student_live_old")
+public class StudentLiveOld extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "live_id")
+    private Long liveId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 学校
+     */
+    private String school;
+
+    /**
+     * 学号
+     */
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 1：家长，2：老师
+     */
+    private String createType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentMindOld.java

@@ -0,0 +1,86 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学生心理健康历史信息对象 student_mind_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("student_mind_old")
+public class StudentMindOld extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "mind_id")
+    private Long mindId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 学校
+     */
+    private String school;
+
+    /**
+     * 学号
+     */
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 心理状况
+     */
+    private String mind;
+
+    /**
+     * 心理健康描述
+     */
+    private String psychologicalDescription;
+
+    /**
+     * 1：家长，2：老师
+     */
+    private String createType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/TeacherInfo.java

@@ -0,0 +1,138 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 老师档案信息对象 teacher_info
+ *
+ * @author boman
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("teacher_info")
+public class TeacherInfo extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 老师id(user表id)）
+     */
+    private Long teacherId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 联系方式
+     */
+    private String phone;
+
+    /**
+     * 职称
+     */
+    private String professional;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 身高
+     */
+    private String height;
+
+    /**
+     * 体重
+     */
+    private String weight;
+
+    /**
+     * 血型
+     */
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    private String politicalStatus;
+
+    /**
+     * 毕业证明照(地址)
+     */
+    private String graduationPhoto;
+
+    /**
+     * 毕业证书照(地址)
+     */
+    private String degreePhoto;
+
+    /**
+     * 教资证明照(地址)
+     */
+    private String teachingPhoto;
+
+    /**
+     * 职称证明照(地址)
+     */
+    private String professionalPhoto;
+
+    /**
+     * 证件照(地址)
+     */
+    private String identificationPhoto;
+
+    /**
+     * 门禁照(地址)
+     */
+    private String entrancePermit;
+
+    /**
+     * 居住地址
+     */
+    private String address;
+
+    /**
+     * 入职时间
+     */
+    private Date onBoardTime;
+
+    /**
+     * 参加工作时间
+     */
+    private Date jobTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ZhxyShyj.java

@@ -29,11 +29,6 @@ public class ZhxyShyj extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
-    /**
-     * 老师id
-     */
-    private Long teacherId;
-
     /**
      * 数据ID
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/RegisterTeacherClassBo.java

@@ -9,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.util.Date;
+
 /**
  * 注册-老师-班级（学科）业务对象 register_teacher_class
  *
@@ -45,7 +47,7 @@ public class RegisterTeacherClassBo extends BaseEntity {
     private String className;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String period;
@@ -62,5 +64,25 @@ public class RegisterTeacherClassBo extends BaseEntity {
     @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/StudentInfoBo.java

@@ -0,0 +1,244 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.StudentInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学生档案信息业务对象 student_info
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = StudentInfo.class, reverseConvertGenerate = false)
+public class StudentInfoBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    //@NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    //@NotNull(message = "学生id（家长-学生(审核通过之后数据)表id）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    //@NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    //@NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    //@NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String age;
+
+    /**
+     * 名族
+     */
+    //@NotBlank(message = "名族不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String familyName;
+
+    /**
+     * 学校
+     */
+    //@NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String school;
+
+    /**
+     * 学号
+     */
+    //@NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    //@NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String idCard;
+
+    /**
+     * 是否近视（1：是，2：否）
+     */
+    //@NotBlank(message = "是否近视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isNearsightedness;
+
+    /**
+     * 近视度数
+     */
+    //@NotBlank(message = "近视度数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String degreeMyopia;
+
+    /**
+     * 是否远视（1：是，2：否）
+     */
+    //@NotBlank(message = "是否远视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isFarsightedness;
+
+    /**
+     * 远视度数
+     */
+    //@NotBlank(message = "远视度数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String farsightedness;
+
+    /**
+     * 身高
+     */
+    //@NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String height;
+
+    /**
+     * 体重
+     */
+    //@NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String weight;
+
+    /**
+     * 血型
+     */
+    //@NotBlank(message = "血型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    //@NotBlank(message = "政治面貌不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String politicalStatus;
+
+    /**
+     * 健康状况
+     */
+    //@NotBlank(message = "健康状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String health;
+
+    /**
+     * 心理状况
+     */
+    //@NotBlank(message = "心理状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String mind;
+
+    /**
+     * 证件照(地址)
+     */
+    //@NotBlank(message = "证件照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String identificationPhoto;
+
+    /**
+     * 门禁照(地址)
+     */
+    //@NotBlank(message = "门禁照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String entrancePermit;
+
+    /**
+     * 紧急联系人
+     */
+    //@NotBlank(message = "紧急联系人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String emergencyContact;
+
+    /**
+     * 紧急联系人手机号
+     */
+    //@NotBlank(message = "紧急联系人手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String emergencyContactTelephone;
+
+    /**
+     * 父亲
+     */
+    //@NotBlank(message = "父亲不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String fatherName;
+
+    /**
+     * 父亲联系方式
+     */
+    //@NotBlank(message = "父亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String fatherTelephone;
+
+    /**
+     * 母亲
+     */
+    //@NotBlank(message = "母亲不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String motherName;
+
+    /**
+     * 母亲联系方式
+     */
+    //@NotBlank(message = "母亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String motherTelephone;
+
+    /**
+     * 居住地址
+     */
+    //@NotBlank(message = "居住地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String address;
+
+    /**
+     * 经度
+     */
+    //@NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    //@NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String latitude;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 有无过往病史（1：有，2：无）
+     */
+    //@NotBlank(message = "有无过往病史（1：有，2：无）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isMedicalHistory;
+
+    /**
+     * 病史描述
+     */
+    //@NotBlank(message = "病史描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String medicalDescription;
+
+    /**
+     * 心里健康描述
+     */
+    //@NotBlank(message = "心里健康描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String psychologicalDescription;
+
+    /**
+     * 留守儿童（1：是，2：否）
+     */
+    //@NotBlank(message = "留守儿童（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isLset;
+
+    /**
+     * 是否贫困
+     */
+    //@NotBlank(message = "是否贫困不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isPoverty;
+
+    private String classId;
+
+    private Long parentsId;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/StudentInfoOldBo.java

@@ -0,0 +1,240 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.StudentInfoOld;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学生档案历史信息业务对象 student_info_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = StudentInfoOld.class, reverseConvertGenerate = false)
+public class StudentInfoOldBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long oldId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    @NotNull(message = "学生id（家长-学生(审核通过之后数据)表id）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String age;
+
+    /**
+     * 名族
+     */
+    @NotBlank(message = "名族不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String familyName;
+
+    /**
+     * 学校
+     */
+    @NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String school;
+
+    /**
+     * 学号
+     */
+    @NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String idCard;
+
+    /**
+     * 是否近视（1：是，2：否）
+     */
+    @NotBlank(message = "是否近视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isNearsightedness;
+
+    /**
+     * 近视度数
+     */
+    @NotBlank(message = "近视度数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String degreeMyopia;
+
+    /**
+     * 是否远视（1：是，2：否）
+     */
+    @NotBlank(message = "是否远视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isFarsightedness;
+
+    /**
+     * 远视度数
+     */
+    @NotBlank(message = "远视度数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String farsightedness;
+
+    /**
+     * 身高
+     */
+    @NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String height;
+
+    /**
+     * 体重
+     */
+    @NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String weight;
+
+    /**
+     * 血型
+     */
+    @NotBlank(message = "血型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    @NotBlank(message = "政治面貌不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String politicalStatus;
+
+    /**
+     * 健康状况
+     */
+    @NotBlank(message = "健康状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String health;
+
+    /**
+     * 证件照(地址)
+     */
+    @NotBlank(message = "证件照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String identificationPhoto;
+
+    /**
+     * 心理状况
+     */
+    @NotBlank(message = "心理状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String mind;
+
+    /**
+     * 门禁照(地址)
+     */
+    @NotBlank(message = "门禁照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String entrancePermit;
+
+    /**
+     * 父亲
+     */
+    @NotBlank(message = "父亲不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String fatherName;
+
+    /**
+     * 父亲联系方式
+     */
+    @NotBlank(message = "父亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String fatherTelephone;
+
+    /**
+     * 母亲
+     */
+    @NotBlank(message = "母亲不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String motherName;
+
+    /**
+     * 母亲联系方式
+     */
+    @NotBlank(message = "母亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String motherTelephone;
+
+    /**
+     * 居住地址
+     */
+    @NotBlank(message = "居住地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String address;
+
+    /**
+     * 经度
+     */
+    @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String latitude;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 有无过往病史（1：有，2：无）
+     */
+    @NotBlank(message = "有无过往病史（1：有，2：无）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isMedicalHistory;
+
+    /**
+     * 病史描述
+     */
+    @NotBlank(message = "病史描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String medicalDescription;
+
+    /**
+     * 心理健康描述
+     */
+    @NotBlank(message = "心理健康描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String psychologicalDescription;
+
+    /**
+     * 留守儿童（1：是，2：否）
+     */
+    @NotBlank(message = "留守儿童（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isLset;
+
+    /**
+     * 是否贫困（1：是，2：否）
+     */
+    @NotBlank(message = "是否贫困（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isPoverty;
+
+    /**
+     * 紧急联系人
+     */
+    @NotBlank(message = "紧急联系人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String emergencyContact;
+
+    /**
+     * 紧急联系人手机号
+     */
+    @NotBlank(message = "紧急联系人手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String emergencyContactTelephone;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/StudentLiveOldBo.java

@@ -0,0 +1,96 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.StudentLiveOld;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学生生活历史信息业务对象 student_live_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = StudentLiveOld.class, reverseConvertGenerate = false)
+public class StudentLiveOldBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long liveId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    @NotNull(message = "学生id（家长-学生(审核通过之后数据)表id）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String age;
+
+    /**
+     * 学校
+     */
+    @NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String school;
+
+    /**
+     * 学号
+     */
+    @NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String idCard;
+
+    /**
+     * 身高
+     */
+    @NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String height;
+
+    /**
+     * 体重
+     */
+    @NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String weight;
+
+    /**
+     * 1：家长，2：老师
+     */
+    @NotBlank(message = "1：家长，2：老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String createType;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/StudentMindOldBo.java

@@ -0,0 +1,96 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.StudentMindOld;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 学生心理健康历史信息业务对象 student_mind_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = StudentMindOld.class, reverseConvertGenerate = false)
+public class StudentMindOldBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long mindId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    @NotNull(message = "学生id（家长-学生(审核通过之后数据)表id）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String age;
+
+    /**
+     * 学校
+     */
+    @NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String school;
+
+    /**
+     * 学号
+     */
+    @NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String idCard;
+
+    /**
+     * 心理状况
+     */
+    @NotBlank(message = "心理状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String mind;
+
+    /**
+     * 心理健康描述
+     */
+    @NotBlank(message = "心理健康描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String psychologicalDescription;
+
+    /**
+     * 1：家长，2：老师
+     */
+    @NotBlank(message = "1：家长，2：老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String createType;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/TeacherInfoBo.java

@@ -0,0 +1,158 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.TeacherInfo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 老师档案信息业务对象 teacher_info
+ *
+ * @author boman
+ * @date 2023-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TeacherInfo.class, reverseConvertGenerate = false)
+public class TeacherInfoBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 老师id(user表id)）
+     */
+    @NotNull(message = "老师id(user表id)）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long teacherId;
+
+    /**
+     * 姓名
+     */
+    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String age;
+
+    /**
+     * 联系方式
+     */
+    @NotBlank(message = "联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String phone;
+
+    /**
+     * 职称
+     */
+    @NotBlank(message = "职称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String professional;
+
+    /**
+     * 身份证号
+     */
+    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String idCard;
+
+    /**
+     * 身高
+     */
+    @NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String height;
+
+    /**
+     * 体重
+     */
+    @NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String weight;
+
+    /**
+     * 血型
+     */
+    @NotBlank(message = "血型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    @NotBlank(message = "政治面貌不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String politicalStatus;
+
+    /**
+     * 毕业证明照(地址)
+     */
+    @NotBlank(message = "毕业证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String graduationPhoto;
+
+    /**
+     * 毕业证书照(地址)
+     */
+    @NotBlank(message = "毕业证书照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String degreePhoto;
+
+    /**
+     * 教资证明照(地址)
+     */
+    @NotBlank(message = "教资证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String teachingPhoto;
+
+    /**
+     * 职称证明照(地址)
+     */
+    @NotBlank(message = "职称证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String professionalPhoto;
+
+    /**
+     * 证件照(地址)
+     */
+    @NotBlank(message = "证件照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String identificationPhoto;
+
+    /**
+     * 门禁照(地址)
+     */
+    @NotBlank(message = "门禁照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String entrancePermit;
+
+    /**
+     * 居住地址
+     */
+    @NotBlank(message = "居住地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String address;
+
+    /**
+     * 入职时间
+     */
+    @NotNull(message = "入职时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date onBoardTime;
+
+    /**
+     * 参加工作时间
+     */
+    @NotNull(message = "参加工作时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date jobTime;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ZhxyShyjBo.java

@@ -25,61 +25,55 @@ public class ZhxyShyjBo extends BaseEntity {
     /**
      * ID
      */
-    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "ID不能为空", groups = { EditGroup.class })
     private Long id;
 
-    /**
-     * 老师id
-     */
-    @NotNull(message = "老师id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long teacherId;
-
     /**
      * 数据ID
      */
-    @NotNull(message = "数据ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "数据ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dataId;
 
     /**
      * 审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
      */
-    @NotBlank(message = "审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 审核人id
      */
-    @NotNull(message = "审核人id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "审核人id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long auditId;
 
     /**
      * 审核人名称
      */
-    @NotBlank(message = "审核人名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "审核人名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String auditUser;
 
     /**
      * 审核结果（是否通过  1：待审核，2：通过 3:不通过)
      */
-    @NotBlank(message = "审核结果（是否通过  1：待审核，2：通过 3:不通过)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "审核结果（是否通过  1：待审核，2：通过 3:不通过)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String shjg;
 
     /**
      * 审核意见
      */
-    @NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class })
     private String shyj;
 
     /**
      * 审核时间
      */
-    @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date shsj;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StudentInfoOldVo.java

@@ -0,0 +1,254 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.StudentInfoOld;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学生档案历史信息视图对象 student_info_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = StudentInfoOld.class)
+public class StudentInfoOldVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long oldId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    @ExcelProperty(value = "学生id", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(value = "姓名")
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @ExcelProperty(value = "性别(1：男，2：女)")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @ExcelProperty(value = "年龄")
+    private String age;
+
+    /**
+     * 名族
+     */
+    @ExcelProperty(value = "名族")
+    private String familyName;
+
+    /**
+     * 学校
+     */
+    @ExcelProperty(value = "学校")
+    private String school;
+
+    /**
+     * 学号
+     */
+    @ExcelProperty(value = "学号")
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "身份证号")
+    private String idCard;
+
+    /**
+     * 是否近视（1：是，2：否）
+     */
+    @ExcelProperty(value = "是否近视", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：是，2：否")
+    private String isNearsightedness;
+
+    /**
+     * 近视度数
+     */
+    @ExcelProperty(value = "近视度数")
+    private String degreeMyopia;
+
+    /**
+     * 是否远视（1：是，2：否）
+     */
+    @ExcelProperty(value = "是否远视", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：是，2：否")
+    private String isFarsightedness;
+
+    /**
+     * 远视度数
+     */
+    @ExcelProperty(value = "远视度数")
+    private String farsightedness;
+
+    /**
+     * 身高
+     */
+    @ExcelProperty(value = "身高")
+    private String height;
+
+    /**
+     * 体重
+     */
+    @ExcelProperty(value = "体重")
+    private String weight;
+
+    /**
+     * 血型
+     */
+    @ExcelProperty(value = "血型")
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    @ExcelProperty(value = "政治面貌")
+    private String politicalStatus;
+
+    /**
+     * 健康状况
+     */
+    @ExcelProperty(value = "健康状况")
+    private String health;
+
+    /**
+     * 证件照(地址)
+     */
+    @ExcelProperty(value = "证件照(地址)")
+    private String identificationPhoto;
+
+    /**
+     * 心理状况
+     */
+    @ExcelProperty(value = "心理状况")
+    private String mind;
+
+    /**
+     * 门禁照(地址)
+     */
+    @ExcelProperty(value = "门禁照(地址)")
+    private String entrancePermit;
+
+    /**
+     * 父亲
+     */
+    @ExcelProperty(value = "父亲")
+    private String fatherName;
+
+    /**
+     * 父亲联系方式
+     */
+    @ExcelProperty(value = "父亲联系方式")
+    private String fatherTelephone;
+
+    /**
+     * 母亲
+     */
+    @ExcelProperty(value = "母亲")
+    private String motherName;
+
+    /**
+     * 母亲联系方式
+     */
+    @ExcelProperty(value = "母亲联系方式")
+    private String motherTelephone;
+
+    /**
+     * 居住地址
+     */
+    @ExcelProperty(value = "居住地址")
+    private String address;
+
+    /**
+     * 经度
+     */
+    @ExcelProperty(value = "经度")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @ExcelProperty(value = "纬度")
+    private String latitude;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 有无过往病史（1：有，2：无）
+     */
+    @ExcelProperty(value = "有无过往病史", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：有，2：无")
+    private String isMedicalHistory;
+
+    /**
+     * 病史描述
+     */
+    @ExcelProperty(value = "病史描述")
+    private String medicalDescription;
+
+    /**
+     * 心理健康描述
+     */
+    @ExcelProperty(value = "心理健康描述")
+    private String psychologicalDescription;
+
+    /**
+     * 留守儿童（1：是，2：否）
+     */
+    @ExcelProperty(value = "留守儿童", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：是，2：否")
+    private String isLset;
+
+    /**
+     * 是否贫困（1：是，2：否）
+     */
+    @ExcelProperty(value = "是否贫困", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：是，2：否")
+    private String isPoverty;
+
+    /**
+     * 紧急联系人
+     */
+    @ExcelProperty(value = "紧急联系人")
+    private String emergencyContact;
+
+    /**
+     * 紧急联系人手机号
+     */
+    @ExcelProperty(value = "紧急联系人手机号")
+    private String emergencyContactTelephone;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StudentInfoVo.java

@@ -0,0 +1,253 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.StudentInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学生档案信息视图对象 student_info
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = StudentInfo.class)
+public class StudentInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    @ExcelProperty(value = "学生id", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(value = "姓名")
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @ExcelProperty(value = "性别(1：男，2：女)")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @ExcelProperty(value = "年龄")
+    private String age;
+
+    /**
+     * 名族
+     */
+    @ExcelProperty(value = "名族")
+    private String familyName;
+
+    /**
+     * 学校
+     */
+    @ExcelProperty(value = "学校")
+    private String school;
+
+    /**
+     * 学号
+     */
+    @ExcelProperty(value = "学号")
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "身份证号")
+    private String idCard;
+
+    /**
+     * 是否近视（1：是，2：否）
+     */
+    @ExcelProperty(value = "是否近视", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：是，2：否")
+    private String isNearsightedness;
+
+    /**
+     * 近视度数
+     */
+    @ExcelProperty(value = "近视度数")
+    private String degreeMyopia;
+
+    /**
+     * 是否远视（1：是，2：否）
+     */
+    @ExcelProperty(value = "是否远视", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：是，2：否")
+    private String isFarsightedness;
+
+    /**
+     * 远视度数
+     */
+    @ExcelProperty(value = "远视度数")
+    private String farsightedness;
+
+    /**
+     * 身高
+     */
+    @ExcelProperty(value = "身高")
+    private String height;
+
+    /**
+     * 体重
+     */
+    @ExcelProperty(value = "体重")
+    private String weight;
+
+    /**
+     * 血型
+     */
+    @ExcelProperty(value = "血型")
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    @ExcelProperty(value = "政治面貌")
+    private String politicalStatus;
+
+    /**
+     * 健康状况
+     */
+    @ExcelProperty(value = "健康状况")
+    private String health;
+
+    /**
+     * 心理状况
+     */
+    @ExcelProperty(value = "心理状况")
+    private String mind;
+
+    /**
+     * 证件照(地址)
+     */
+    @ExcelProperty(value = "证件照(地址)")
+    private String identificationPhoto;
+
+    /**
+     * 门禁照(地址)
+     */
+    @ExcelProperty(value = "门禁照(地址)")
+    private String entrancePermit;
+
+    /**
+     * 紧急联系人
+     */
+    @ExcelProperty(value = "紧急联系人")
+    private String emergencyContact;
+
+    /**
+     * 紧急联系人手机号
+     */
+    @ExcelProperty(value = "紧急联系人手机号")
+    private String emergencyContactTelephone;
+
+    /**
+     * 父亲
+     */
+    @ExcelProperty(value = "父亲")
+    private String fatherName;
+
+    /**
+     * 父亲联系方式
+     */
+    @ExcelProperty(value = "父亲联系方式")
+    private String fatherTelephone;
+
+    /**
+     * 母亲
+     */
+    @ExcelProperty(value = "母亲")
+    private String motherName;
+
+    /**
+     * 母亲联系方式
+     */
+    @ExcelProperty(value = "母亲联系方式")
+    private String motherTelephone;
+
+    /**
+     * 居住地址
+     */
+    @ExcelProperty(value = "居住地址")
+    private String address;
+
+    /**
+     * 经度
+     */
+    @ExcelProperty(value = "经度")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @ExcelProperty(value = "纬度")
+    private String latitude;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 有无过往病史（1：有，2：无）
+     */
+    @ExcelProperty(value = "有无过往病史", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：有，2：无")
+    private String isMedicalHistory;
+
+    /**
+     * 病史描述
+     */
+    @ExcelProperty(value = "病史描述")
+    private String medicalDescription;
+
+    /**
+     * 心里健康描述
+     */
+    @ExcelProperty(value = "心里健康描述")
+    private String psychologicalDescription;
+
+    /**
+     * 留守儿童（1：是，2：否）
+     */
+    @ExcelProperty(value = "留守儿童", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：是，2：否")
+    private String isLset;
+
+    /**
+     * 是否贫困
+     */
+    @ExcelProperty(value = "是否贫困")
+    private String isPoverty;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StudentLiveOldVo.java

@@ -0,0 +1,105 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.StudentLiveOld;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学生生活历史信息视图对象 student_live_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = StudentLiveOld.class)
+public class StudentLiveOldVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long liveId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    @ExcelProperty(value = "学生id", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(value = "姓名")
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @ExcelProperty(value = "性别(1：男，2：女)")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @ExcelProperty(value = "年龄")
+    private String age;
+
+    /**
+     * 学校
+     */
+    @ExcelProperty(value = "学校")
+    private String school;
+
+    /**
+     * 学号
+     */
+    @ExcelProperty(value = "学号")
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "身份证号")
+    private String idCard;
+
+    /**
+     * 身高
+     */
+    @ExcelProperty(value = "身高")
+    private String height;
+
+    /**
+     * 体重
+     */
+    @ExcelProperty(value = "体重")
+    private String weight;
+
+    /**
+     * 1：家长，2：老师
+     */
+    @ExcelProperty(value = "1：家长，2：老师")
+    private String createType;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/StudentMindOldVo.java

@@ -0,0 +1,105 @@
+package org.dromara.system.domain.vo;
+
+import org.dromara.system.domain.StudentMindOld;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 学生心理健康历史信息视图对象 student_mind_old
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = StudentMindOld.class)
+public class StudentMindOldVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long mindId;
+
+    /**
+     * 学生id（家长-学生(审核通过之后数据)表id）
+     */
+    @ExcelProperty(value = "学生id", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(value = "姓名")
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @ExcelProperty(value = "性别(1：男，2：女)")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @ExcelProperty(value = "年龄")
+    private String age;
+
+    /**
+     * 学校
+     */
+    @ExcelProperty(value = "学校")
+    private String school;
+
+    /**
+     * 学号
+     */
+    @ExcelProperty(value = "学号")
+    private String studentNumber;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "身份证号")
+    private String idCard;
+
+    /**
+     * 心理状况
+     */
+    @ExcelProperty(value = "心理状况")
+    private String mind;
+
+    /**
+     * 心理健康描述
+     */
+    @ExcelProperty(value = "心理健康描述")
+    private String psychologicalDescription;
+
+    /**
+     * 1：家长，2：老师
+     */
+    @ExcelProperty(value = "1：家长，2：老师")
+    private String createType;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/TeacherInfoVo.java

@@ -0,0 +1,166 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.TeacherInfo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 老师档案信息视图对象 teacher_info
+ *
+ * @author boman
+ * @date 2023-08-16
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TeacherInfo.class)
+public class TeacherInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 老师id(user表id)）
+     */
+    @ExcelProperty(value = "老师id(user表id)）")
+    private Long teacherId;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(value = "姓名")
+    private String name;
+
+    /**
+     * 性别(1：男，2：女)
+     */
+    @ExcelProperty(value = "性别(1：男，2：女)")
+    private String sex;
+
+    /**
+     * 年龄
+     */
+    @ExcelProperty(value = "年龄")
+    private String age;
+
+    /**
+     * 联系方式
+     */
+    @ExcelProperty(value = "联系方式")
+    private String phone;
+
+    /**
+     * 职称
+     */
+    @ExcelProperty(value = "职称")
+    private String professional;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(value = "身份证号")
+    private String idCard;
+
+    /**
+     * 身高
+     */
+    @ExcelProperty(value = "身高")
+    private String height;
+
+    /**
+     * 体重
+     */
+    @ExcelProperty(value = "体重")
+    private String weight;
+
+    /**
+     * 血型
+     */
+    @ExcelProperty(value = "血型")
+    private String bloodType;
+
+    /**
+     * 政治面貌
+     */
+    @ExcelProperty(value = "政治面貌")
+    private String politicalStatus;
+
+    /**
+     * 毕业证明照(地址)
+     */
+    @ExcelProperty(value = "毕业证明照(地址)")
+    private String graduationPhoto;
+
+    /**
+     * 毕业证书照(地址)
+     */
+    @ExcelProperty(value = "毕业证书照(地址)")
+    private String degreePhoto;
+
+    /**
+     * 教资证明照(地址)
+     */
+    @ExcelProperty(value = "教资证明照(地址)")
+    private String teachingPhoto;
+
+    /**
+     * 职称证明照(地址)
+     */
+    @ExcelProperty(value = "职称证明照(地址)")
+    private String professionalPhoto;
+
+    /**
+     * 证件照(地址)
+     */
+    @ExcelProperty(value = "证件照(地址)")
+    private String identificationPhoto;
+
+    /**
+     * 门禁照(地址)
+     */
+    @ExcelProperty(value = "门禁照(地址)")
+    private String entrancePermit;
+
+    /**
+     * 居住地址
+     */
+    @ExcelProperty(value = "居住地址")
+    private String address;
+
+    /**
+     * 入职时间
+     */
+    @ExcelProperty(value = "入职时间")
+    private Date onBoardTime;
+
+    /**
+     * 参加工作时间
+     */
+    @ExcelProperty(value = "参加工作时间")
+    private Date jobTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ZhxyShyjVo.java

@@ -36,12 +36,6 @@ public class ZhxyShyjVo implements Serializable {
     @ExcelProperty(value = "ID")
     private Long id;
 
-    /**
-     * 老师id
-     */
-    @ExcelProperty(value = "老师id")
-    private Long teacherId;
-
     /**
      * 数据ID
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.StudentInfo;
+import org.dromara.system.domain.vo.StudentInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学生档案信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface StudentInfoMapper extends BaseMapperPlus<StudentInfo, StudentInfoVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentInfoOldMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.StudentInfoOld;
+import org.dromara.system.domain.vo.StudentInfoOldVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学生档案历史信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface StudentInfoOldMapper extends BaseMapperPlus<StudentInfoOld, StudentInfoOldVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentLiveOldMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.StudentLiveOld;
+import org.dromara.system.domain.vo.StudentLiveOldVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学生生活历史信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface StudentLiveOldMapper extends BaseMapperPlus<StudentLiveOld, StudentLiveOldVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentMindOldMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.StudentMindOld;
+import org.dromara.system.domain.vo.StudentMindOldVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 学生心理健康历史信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface StudentMindOldMapper extends BaseMapperPlus<StudentMindOld, StudentMindOldVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java

@@ -44,7 +44,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
      */
     List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
-    SysDept selectDeptByParentId(long parentId);
+    SysDeptVo selectDeptByParentId(long parentId);
 
     void insertDeptList(List<SysDept> sysDeptList);
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/TeacherInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.TeacherInfo;
+import org.dromara.system.domain.vo.TeacherInfoVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 老师档案信息Mapper接口
+ *
+ * @author boman
+ * @date 2023-08-16
+ */
+public interface TeacherInfoMapper extends BaseMapperPlus<TeacherInfo, TeacherInfoVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentInfoOldService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.StudentInfoOld;
+import org.dromara.system.domain.vo.StudentInfoOldVo;
+import org.dromara.system.domain.bo.StudentInfoOldBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学生档案历史信息Service接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface IStudentInfoOldService {
+
+    /**
+     * 查询学生档案历史信息
+     */
+    StudentInfoOldVo queryById(Long oldId);
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    TableDataInfo<StudentInfoOldVo> queryPageList(StudentInfoOldBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    List<StudentInfoOldVo> queryList(StudentInfoOldBo bo);
+
+    /**
+     * 新增学生档案历史信息
+     */
+    Boolean insertByBo(StudentInfoOldBo bo);
+
+    /**
+     * 修改学生档案历史信息
+     */
+    Boolean updateByBo(StudentInfoOldBo bo);
+
+    /**
+     * 校验并批量删除学生档案历史信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentInfoService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.StudentInfo;
+import org.dromara.system.domain.vo.StudentInfoVo;
+import org.dromara.system.domain.bo.StudentInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学生档案信息Service接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface IStudentInfoService {
+
+    /**
+     * 查询学生档案信息
+     */
+    StudentInfoVo queryById(Long id);
+
+    /**
+     * 查询学生档案信息列表
+     */
+    TableDataInfo<StudentInfoVo> queryPageList(StudentInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询学生档案信息列表
+     */
+    List<StudentInfoVo> queryList(StudentInfoBo bo);
+
+    /**
+     * 新增学生档案信息
+     */
+    Boolean insertByBo(StudentInfoBo bo);
+
+    /**
+     * 修改学生档案信息
+     */
+    Boolean updateByBo(StudentInfoBo bo);
+
+    /**
+     * 校验并批量删除学生档案信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentLiveOldService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.StudentLiveOld;
+import org.dromara.system.domain.vo.StudentLiveOldVo;
+import org.dromara.system.domain.bo.StudentLiveOldBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学生生活历史信息Service接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface IStudentLiveOldService {
+
+    /**
+     * 查询学生生活历史信息
+     */
+    StudentLiveOldVo queryById(Long liveId);
+
+    /**
+     * 查询学生生活历史信息列表
+     */
+    TableDataInfo<StudentLiveOldVo> queryPageList(StudentLiveOldBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询学生生活历史信息列表
+     */
+    List<StudentLiveOldVo> queryList(StudentLiveOldBo bo);
+
+    /**
+     * 新增学生生活历史信息
+     */
+    Boolean insertByBo(StudentLiveOldBo bo);
+
+    /**
+     * 修改学生生活历史信息
+     */
+    Boolean updateByBo(StudentLiveOldBo bo);
+
+    /**
+     * 校验并批量删除学生生活历史信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentMindOldService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.StudentMindOld;
+import org.dromara.system.domain.vo.StudentMindOldVo;
+import org.dromara.system.domain.bo.StudentMindOldBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学生心理健康历史信息Service接口
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+public interface IStudentMindOldService {
+
+    /**
+     * 查询学生心理健康历史信息
+     */
+    StudentMindOldVo queryById(Long mindId);
+
+    /**
+     * 查询学生心理健康历史信息列表
+     */
+    TableDataInfo<StudentMindOldVo> queryPageList(StudentMindOldBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询学生心理健康历史信息列表
+     */
+    List<StudentMindOldVo> queryList(StudentMindOldBo bo);
+
+    /**
+     * 新增学生心理健康历史信息
+     */
+    Boolean insertByBo(StudentMindOldBo bo);
+
+    /**
+     * 修改学生心理健康历史信息
+     */
+    Boolean updateByBo(StudentMindOldBo bo);
+
+    /**
+     * 校验并批量删除学生心理健康历史信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ITeacherInfoService.java

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.TeacherInfo;
+import org.dromara.system.domain.vo.TeacherInfoVo;
+import org.dromara.system.domain.bo.TeacherInfoBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 老师档案信息Service接口
+ *
+ * @author boman
+ * @date 2023-08-16
+ */
+public interface ITeacherInfoService {
+
+    /**
+     * 查询老师档案信息
+     */
+    TeacherInfoVo queryById(Long id);
+
+    /**
+     * 查询老师档案信息列表
+     */
+    TableDataInfo<TeacherInfoVo> queryPageList(TeacherInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询老师档案信息列表
+     */
+    List<TeacherInfoVo> queryList(TeacherInfoBo bo);
+
+    /**
+     * 新增老师档案信息
+     */
+    Boolean insertByBo(TeacherInfoBo bo);
+
+    /**
+     * 修改老师档案信息
+     */
+    Boolean updateByBo(TeacherInfoBo bo);
+
+    /**
+     * 校验并批量删除老师档案信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterSchoolFileServiceImpl.java

@@ -61,8 +61,8 @@ public class RegisterSchoolFileServiceImpl implements IRegisterSchoolFileService
     private LambdaQueryWrapper<RegisterSchoolFile> buildQueryWrapper(RegisterSchoolFileBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<RegisterSchoolFile> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getSchoolId() != null, RegisterSchoolFile::getSchoolId, bo.getSchoolId());
-        lqw.eq(bo.getDeptId() != null, RegisterSchoolFile::getDeptId, bo.getDeptId());
+        lqw.eq(bo.getSchoolId() != null && bo.getSchoolId() != 0L, RegisterSchoolFile::getSchoolId, bo.getSchoolId());
+        lqw.eq(bo.getDeptId() != null && bo.getSchoolId() != 0L, RegisterSchoolFile::getDeptId, bo.getDeptId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), RegisterSchoolFile::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getUrl()), RegisterSchoolFile::getUrl, bo.getUrl());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), RegisterSchoolFile::getType, bo.getType());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterSchoolServiceImpl.java

@@ -45,14 +45,14 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService {
 
     private final RegisterSchoolFileMapper registerSchoolFileMapper;
 
-    private RegisterTeacherMapper registerTeacherMapper;
-    private RegisterParentsMapper registerParentsMapper;
+    private final RegisterTeacherMapper registerTeacherMapper;
+    private final RegisterParentsMapper registerParentsMapper;
 
-    private IRegisterTeacherClassService registerTeacherClassService;
-    private RegisterTeacherClassMapper registerTeacherClassMapper;
+    private final IRegisterTeacherClassService registerTeacherClassService;
+    private final RegisterTeacherClassMapper registerTeacherClassMapper;
 
-    private IRegisterParentsStudentService registerParentsStudentService;
-    private RegisterParentsStudentMapper registerParentsStudentMapper;
+    private final IRegisterParentsStudentService registerParentsStudentService;
+    private final RegisterParentsStudentMapper registerParentsStudentMapper;
 
     /**
      * 查询注册-学校
@@ -129,6 +129,13 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService {
             }
         }
 
+        bo.setCreateTime(DateUtils.getNowDate());
+        bo.setUpdateTime(DateUtils.getNowDate());
+        bo.setIsPass("1");
+        RegisterSchool add = MapstructUtils.convert(bo, RegisterSchool.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+
         if(bo.getRegisterSchoolFileList()!=null && bo.getRegisterSchoolFileList().size()>0){
             List<RegisterSchoolFileVo> registerSchoolFile = bo.getRegisterSchoolFileList();
             for (RegisterSchoolFileVo schoolFile : registerSchoolFile) {
@@ -138,12 +145,7 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService {
             }
         }
 
-        bo.setCreateTime(DateUtils.getNowDate());
-        bo.setUpdateTime(DateUtils.getNowDate());
-        bo.setIsPass("1");
-        RegisterSchool add = MapstructUtils.convert(bo, RegisterSchool.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
+
 
         if (flag) {
             bo.setId(add.getId());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterTeacherServiceImpl.java

@@ -1,6 +1,8 @@
 package org.dromara.system.service.impl;
 
+import lombok.SneakyThrows;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.ClassUtils;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -48,7 +50,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
      * 查询注册-老师
      */
     @Override
-    public RegisterTeacherVo queryById(Long id){
+    public RegisterTeacherVo queryById(Long id) {
 
         RegisterTeacherVo registerTeacher = baseMapper.selectVoById(id);
         RegisterTeacherClassBo registerTeacherClass = new RegisterTeacherClassBo();
@@ -66,7 +68,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
     public TableDataInfo<RegisterTeacherVo> queryPageList(RegisterTeacherBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<RegisterTeacher> lqw = buildQueryWrapper(bo);
         Page<RegisterTeacherVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        if(result.getRecords()!=null && result.getRecords().size()>0){
+        if (result.getRecords() != null && result.getRecords().size() > 0) {
             for (RegisterTeacherVo teacher : result.getRecords()) {
                 RegisterTeacherClassBo registerTeacherClass = new RegisterTeacherClassBo();
                 registerTeacherClass.setTeacherId(teacher.getId());
@@ -105,41 +107,45 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
     /**
      * 新增注册-老师
      */
+    @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<RegisterTeacherVo> insertByBo(RegisterTeacherBo bo) {
 
         //查询是否已经注册过
         RegisterTeacherVo registerTeacherOld = baseMapper.selectRegisterTeacherByPhonenumber(bo.getUserPhone());
-        if(registerTeacherOld!=null){
-            if(registerTeacherOld.getIsPass().equals("1")){
-                return R.fail("该微信已注册当前身份，信息正在审核中。",registerTeacherOld);
-            }else if(registerTeacherOld.getIsPass().equals("2")){
-                return R.fail("该微信已注册当前身份，审核已通过，请登录。",registerTeacherOld);
-            }else{
-                return R.fail("该微信已注册当前身份，审核未通过。",registerTeacherOld);
+        if (registerTeacherOld != null) {
+            if (registerTeacherOld.getIsPass().equals("1")) {
+                return R.fail("该微信已注册当前身份，信息正在审核中。", registerTeacherOld);
+            } else if (registerTeacherOld.getIsPass().equals("2")) {
+                return R.fail("该微信已注册当前身份，审核已通过，请登录。", registerTeacherOld);
+            } else {
+                return R.fail("该微信已注册当前身份，审核未通过。", registerTeacherOld);
             }
         }
         bo.setCreateTime(DateUtils.getNowDate());
         bo.setUpdateTime(DateUtils.getNowDate());
+        RegisterTeacher add = MapstructUtils.convert(bo, RegisterTeacher.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+
+        if (bo.getRegisterTeacherClassList() != null && bo.getRegisterTeacherClassList().size() > 0) {
+
+            List<RegisterTeacherClassVo> registerTeacherClassList = bo.getRegisterTeacherClassList();
 
-        List<RegisterTeacherClassVo> registerTeacherClassList = bo.getRegisterTeacherClassList();
-        if(registerTeacherClassList!=null && registerTeacherClassList.size()>0){
             for (RegisterTeacherClassVo registerTeacherClass : registerTeacherClassList) {
                 registerTeacherClass.setTeacherId(bo.getId());
-
                 String className = registerTeacherClass.getClassName();
                 int period = getPeriod(className);
                 registerTeacherClass.setPeriod(String.valueOf(period));
-                RegisterTeacherClassBo registerTeacherClassBo = MapstructUtils.convert(registerTeacherClass, RegisterTeacherClassBo.class);
-                registerTeacherClassService.insertByBo(registerTeacherClassBo);
+
+                RegisterTeacherClassBo teacherClassBo = new RegisterTeacherClassBo();
+                ClassUtils.copyProperties(registerTeacherClass, teacherClassBo);
+                registerTeacherClassService.insertByBo(teacherClassBo);
 
             }
         }
 
-        RegisterTeacher add = MapstructUtils.convert(bo, RegisterTeacher.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
             return R.ok();
@@ -154,59 +160,59 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
         //获取当前月
         int month = DateUtils.getMonth();
         //计算届数
-        if(className.contains("一年级")){
-            if(month<7){
-                period = year-1;
-            }else {
+        if (className.contains("一年级")) {
+            if (month < 7) {
+                period = year - 1;
+            } else {
                 period = year;
             }
-        }else if(className.contains("二年级")){
-            if(month<7){
-                period = year-2;
-            }else {
-                period = year-1;
+        } else if (className.contains("二年级")) {
+            if (month < 7) {
+                period = year - 2;
+            } else {
+                period = year - 1;
             }
-        }else if(className.contains("三年级")){
-            if(month<7){
-                period = year-3;
-            }else {
-                period = year-2;
+        } else if (className.contains("三年级")) {
+            if (month < 7) {
+                period = year - 3;
+            } else {
+                period = year - 2;
             }
-        }else if(className.contains("四年级")){
-            if(month<7){
-                period = year-4;
-            }else {
-                period = year-3;
+        } else if (className.contains("四年级")) {
+            if (month < 7) {
+                period = year - 4;
+            } else {
+                period = year - 3;
             }
-        }else if(className.contains("五年级")){
-            if(month<7){
-                period = year-5;
-            }else {
-                period = year-4;
+        } else if (className.contains("五年级")) {
+            if (month < 7) {
+                period = year - 5;
+            } else {
+                period = year - 4;
             }
-        }else if(className.contains("六年级")){
-            if(month<7){
-                period = year-6;
-            }else {
-                period = year-5;
+        } else if (className.contains("六年级")) {
+            if (month < 7) {
+                period = year - 6;
+            } else {
+                period = year - 5;
             }
-        }else if(className.contains("七年级")){
-            if(month<7){
-                period = year-1;
-            }else {
+        } else if (className.contains("七年级")) {
+            if (month < 7) {
+                period = year - 1;
+            } else {
                 period = year;
             }
-        }else if(className.contains("八年级")){
-            if(month<7){
-                period = year-2;
-            }else {
-                period = year-1;
+        } else if (className.contains("八年级")) {
+            if (month < 7) {
+                period = year - 2;
+            } else {
+                period = year - 1;
             }
-        }else if(className.contains("九年级")){
-            if(month<7){
-                period = year-3;
-            }else {
-                period = year-2;
+        } else if (className.contains("九年级")) {
+            if (month < 7) {
+                period = year - 3;
+            } else {
+                period = year - 2;
             }
         }
         return period;
@@ -220,7 +226,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
 
         //删除注册表-老师-班级（学科）表
         List<RegisterTeacherClassVo> registerTeacherClassList = bo.getRegisterTeacherClassList();
-        if(registerTeacherClassList!=null && registerTeacherClassList.size()>0){
+        if (registerTeacherClassList != null && registerTeacherClassList.size() > 0) {
             registerTeacherClassMapper.deleteRegisterTeacherClassByTeacherId(bo.getId());
             for (RegisterTeacherClassVo registerTeacherClass : registerTeacherClassList) {
                 registerTeacherClass.setTeacherId(bo.getId());
@@ -243,7 +249,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(RegisterTeacher entity){
+    private void validEntityBeforeSave(RegisterTeacher entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -252,7 +258,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StudentInfoOldServiceImpl.java

@@ -0,0 +1,142 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.StudentInfoOldBo;
+import org.dromara.system.domain.vo.StudentInfoOldVo;
+import org.dromara.system.domain.StudentInfoOld;
+import org.dromara.system.mapper.StudentInfoOldMapper;
+import org.dromara.system.service.IStudentInfoOldService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学生档案历史信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@RequiredArgsConstructor
+@Service
+public class StudentInfoOldServiceImpl implements IStudentInfoOldService {
+
+    private final StudentInfoOldMapper baseMapper;
+
+    /**
+     * 查询学生档案历史信息
+     */
+    @Override
+    public StudentInfoOldVo queryById(Long oldId){
+        return baseMapper.selectVoById(oldId);
+    }
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    @Override
+    public TableDataInfo<StudentInfoOldVo> queryPageList(StudentInfoOldBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StudentInfoOld> lqw = buildQueryWrapper(bo);
+        Page<StudentInfoOldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    @Override
+    public List<StudentInfoOldVo> queryList(StudentInfoOldBo bo) {
+        LambdaQueryWrapper<StudentInfoOld> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<StudentInfoOld> buildQueryWrapper(StudentInfoOldBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<StudentInfoOld> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStudentId() != null, StudentInfoOld::getStudentId, bo.getStudentId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), StudentInfoOld::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), StudentInfoOld::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), StudentInfoOld::getAge, bo.getAge());
+        lqw.like(StringUtils.isNotBlank(bo.getFamilyName()), StudentInfoOld::getFamilyName, bo.getFamilyName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchool()), StudentInfoOld::getSchool, bo.getSchool());
+        lqw.eq(StringUtils.isNotBlank(bo.getStudentNumber()), StudentInfoOld::getStudentNumber, bo.getStudentNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), StudentInfoOld::getIdCard, bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsNearsightedness()), StudentInfoOld::getIsNearsightedness, bo.getIsNearsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getDegreeMyopia()), StudentInfoOld::getDegreeMyopia, bo.getDegreeMyopia());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsFarsightedness()), StudentInfoOld::getIsFarsightedness, bo.getIsFarsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getFarsightedness()), StudentInfoOld::getFarsightedness, bo.getFarsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeight()), StudentInfoOld::getHeight, bo.getHeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getWeight()), StudentInfoOld::getWeight, bo.getWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getBloodType()), StudentInfoOld::getBloodType, bo.getBloodType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPoliticalStatus()), StudentInfoOld::getPoliticalStatus, bo.getPoliticalStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getHealth()), StudentInfoOld::getHealth, bo.getHealth());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdentificationPhoto()), StudentInfoOld::getIdentificationPhoto, bo.getIdentificationPhoto());
+        lqw.eq(StringUtils.isNotBlank(bo.getMind()), StudentInfoOld::getMind, bo.getMind());
+        lqw.eq(StringUtils.isNotBlank(bo.getEntrancePermit()), StudentInfoOld::getEntrancePermit, bo.getEntrancePermit());
+        lqw.like(StringUtils.isNotBlank(bo.getFatherName()), StudentInfoOld::getFatherName, bo.getFatherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getFatherTelephone()), StudentInfoOld::getFatherTelephone, bo.getFatherTelephone());
+        lqw.like(StringUtils.isNotBlank(bo.getMotherName()), StudentInfoOld::getMotherName, bo.getMotherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getMotherTelephone()), StudentInfoOld::getMotherTelephone, bo.getMotherTelephone());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddress()), StudentInfoOld::getAddress, bo.getAddress());
+        lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), StudentInfoOld::getLongitude, bo.getLongitude());
+        lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), StudentInfoOld::getLatitude, bo.getLatitude());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsMedicalHistory()), StudentInfoOld::getIsMedicalHistory, bo.getIsMedicalHistory());
+        lqw.eq(StringUtils.isNotBlank(bo.getMedicalDescription()), StudentInfoOld::getMedicalDescription, bo.getMedicalDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getPsychologicalDescription()), StudentInfoOld::getPsychologicalDescription, bo.getPsychologicalDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsLset()), StudentInfoOld::getIsLset, bo.getIsLset());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsPoverty()), StudentInfoOld::getIsPoverty, bo.getIsPoverty());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), StudentInfoOld::getEmergencyContact, bo.getEmergencyContact());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactTelephone()), StudentInfoOld::getEmergencyContactTelephone, bo.getEmergencyContactTelephone());
+        return lqw;
+    }
+
+    /**
+     * 新增学生档案历史信息
+     */
+    @Override
+    public Boolean insertByBo(StudentInfoOldBo bo) {
+        StudentInfoOld add = MapstructUtils.convert(bo, StudentInfoOld.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setOldId(add.getOldId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学生档案历史信息
+     */
+    @Override
+    public Boolean updateByBo(StudentInfoOldBo bo) {
+        StudentInfoOld update = MapstructUtils.convert(bo, StudentInfoOld.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(StudentInfoOld entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除学生档案历史信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StudentInfoServiceImpl.java

@@ -0,0 +1,156 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.StudentInfoBo;
+import org.dromara.system.domain.vo.StudentInfoVo;
+import org.dromara.system.domain.StudentInfo;
+import org.dromara.system.mapper.StudentInfoMapper;
+import org.dromara.system.service.IStudentInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学生档案信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@RequiredArgsConstructor
+@Service
+public class StudentInfoServiceImpl implements IStudentInfoService {
+
+    private final StudentInfoMapper baseMapper;
+
+    /**
+     * 查询学生档案信息
+     */
+    @Override
+    public StudentInfoVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询学生档案信息列表
+     */
+    @Override
+    public TableDataInfo<StudentInfoVo> queryPageList(StudentInfoBo bo, PageQuery pageQuery) {
+
+        LoginUser user = LoginHelper.getLoginUser();
+        Map<String, Object> params = bo.getParams();
+        String role = "";
+        if (params != null && params.size() > 0) {
+            role = (String) params.get("role");
+        }
+        if("parents".equals(role)){
+            bo.setParentsId(user.getUserId());
+        }
+        //return baseMapper.selectStudentInfoList(pageQuery,bo);
+
+        LambdaQueryWrapper<StudentInfo> lqw = buildQueryWrapper(bo);
+        Page<StudentInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询学生档案信息列表
+     */
+    @Override
+    public List<StudentInfoVo> queryList(StudentInfoBo bo) {
+        LambdaQueryWrapper<StudentInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<StudentInfo> buildQueryWrapper(StudentInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<StudentInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStudentId() != null, StudentInfo::getStudentId, bo.getStudentId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), StudentInfo::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), StudentInfo::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), StudentInfo::getAge, bo.getAge());
+        lqw.like(StringUtils.isNotBlank(bo.getFamilyName()), StudentInfo::getFamilyName, bo.getFamilyName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchool()), StudentInfo::getSchool, bo.getSchool());
+        lqw.eq(StringUtils.isNotBlank(bo.getStudentNumber()), StudentInfo::getStudentNumber, bo.getStudentNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), StudentInfo::getIdCard, bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsNearsightedness()), StudentInfo::getIsNearsightedness, bo.getIsNearsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getDegreeMyopia()), StudentInfo::getDegreeMyopia, bo.getDegreeMyopia());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsFarsightedness()), StudentInfo::getIsFarsightedness, bo.getIsFarsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getFarsightedness()), StudentInfo::getFarsightedness, bo.getFarsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeight()), StudentInfo::getHeight, bo.getHeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getWeight()), StudentInfo::getWeight, bo.getWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getBloodType()), StudentInfo::getBloodType, bo.getBloodType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPoliticalStatus()), StudentInfo::getPoliticalStatus, bo.getPoliticalStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getHealth()), StudentInfo::getHealth, bo.getHealth());
+        lqw.eq(StringUtils.isNotBlank(bo.getMind()), StudentInfo::getMind, bo.getMind());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdentificationPhoto()), StudentInfo::getIdentificationPhoto, bo.getIdentificationPhoto());
+        lqw.eq(StringUtils.isNotBlank(bo.getEntrancePermit()), StudentInfo::getEntrancePermit, bo.getEntrancePermit());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), StudentInfo::getEmergencyContact, bo.getEmergencyContact());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactTelephone()), StudentInfo::getEmergencyContactTelephone, bo.getEmergencyContactTelephone());
+        lqw.like(StringUtils.isNotBlank(bo.getFatherName()), StudentInfo::getFatherName, bo.getFatherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getFatherTelephone()), StudentInfo::getFatherTelephone, bo.getFatherTelephone());
+        lqw.like(StringUtils.isNotBlank(bo.getMotherName()), StudentInfo::getMotherName, bo.getMotherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getMotherTelephone()), StudentInfo::getMotherTelephone, bo.getMotherTelephone());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddress()), StudentInfo::getAddress, bo.getAddress());
+        lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), StudentInfo::getLongitude, bo.getLongitude());
+        lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), StudentInfo::getLatitude, bo.getLatitude());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsMedicalHistory()), StudentInfo::getIsMedicalHistory, bo.getIsMedicalHistory());
+        lqw.eq(StringUtils.isNotBlank(bo.getMedicalDescription()), StudentInfo::getMedicalDescription, bo.getMedicalDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getPsychologicalDescription()), StudentInfo::getPsychologicalDescription, bo.getPsychologicalDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsLset()), StudentInfo::getIsLset, bo.getIsLset());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsPoverty()), StudentInfo::getIsPoverty, bo.getIsPoverty());
+        return lqw;
+    }
+
+    /**
+     * 新增学生档案信息
+     */
+    @Override
+    public Boolean insertByBo(StudentInfoBo bo) {
+        StudentInfo add = MapstructUtils.convert(bo, StudentInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学生档案信息
+     */
+    @Override
+    public Boolean updateByBo(StudentInfoBo bo) {
+        StudentInfo update = MapstructUtils.convert(bo, StudentInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(StudentInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除学生档案信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StudentLiveOldServiceImpl.java

@@ -0,0 +1,118 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.StudentLiveOldBo;
+import org.dromara.system.domain.vo.StudentLiveOldVo;
+import org.dromara.system.domain.StudentLiveOld;
+import org.dromara.system.mapper.StudentLiveOldMapper;
+import org.dromara.system.service.IStudentLiveOldService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学生生活历史信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@RequiredArgsConstructor
+@Service
+public class StudentLiveOldServiceImpl implements IStudentLiveOldService {
+
+    private final StudentLiveOldMapper baseMapper;
+
+    /**
+     * 查询学生生活历史信息
+     */
+    @Override
+    public StudentLiveOldVo queryById(Long liveId){
+        return baseMapper.selectVoById(liveId);
+    }
+
+    /**
+     * 查询学生生活历史信息列表
+     */
+    @Override
+    public TableDataInfo<StudentLiveOldVo> queryPageList(StudentLiveOldBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StudentLiveOld> lqw = buildQueryWrapper(bo);
+        Page<StudentLiveOldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询学生生活历史信息列表
+     */
+    @Override
+    public List<StudentLiveOldVo> queryList(StudentLiveOldBo bo) {
+        LambdaQueryWrapper<StudentLiveOld> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<StudentLiveOld> buildQueryWrapper(StudentLiveOldBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<StudentLiveOld> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStudentId() != null, StudentLiveOld::getStudentId, bo.getStudentId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), StudentLiveOld::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), StudentLiveOld::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), StudentLiveOld::getAge, bo.getAge());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchool()), StudentLiveOld::getSchool, bo.getSchool());
+        lqw.eq(StringUtils.isNotBlank(bo.getStudentNumber()), StudentLiveOld::getStudentNumber, bo.getStudentNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), StudentLiveOld::getIdCard, bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeight()), StudentLiveOld::getHeight, bo.getHeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getWeight()), StudentLiveOld::getWeight, bo.getWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateType()), StudentLiveOld::getCreateType, bo.getCreateType());
+        return lqw;
+    }
+
+    /**
+     * 新增学生生活历史信息
+     */
+    @Override
+    public Boolean insertByBo(StudentLiveOldBo bo) {
+        StudentLiveOld add = MapstructUtils.convert(bo, StudentLiveOld.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setLiveId(add.getLiveId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学生生活历史信息
+     */
+    @Override
+    public Boolean updateByBo(StudentLiveOldBo bo) {
+        StudentLiveOld update = MapstructUtils.convert(bo, StudentLiveOld.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(StudentLiveOld entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除学生生活历史信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StudentMindOldServiceImpl.java

@@ -0,0 +1,118 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.StudentMindOldBo;
+import org.dromara.system.domain.vo.StudentMindOldVo;
+import org.dromara.system.domain.StudentMindOld;
+import org.dromara.system.mapper.StudentMindOldMapper;
+import org.dromara.system.service.IStudentMindOldService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学生心理健康历史信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2023-08-16
+ */
+@RequiredArgsConstructor
+@Service
+public class StudentMindOldServiceImpl implements IStudentMindOldService {
+
+    private final StudentMindOldMapper baseMapper;
+
+    /**
+     * 查询学生心理健康历史信息
+     */
+    @Override
+    public StudentMindOldVo queryById(Long mindId){
+        return baseMapper.selectVoById(mindId);
+    }
+
+    /**
+     * 查询学生心理健康历史信息列表
+     */
+    @Override
+    public TableDataInfo<StudentMindOldVo> queryPageList(StudentMindOldBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<StudentMindOld> lqw = buildQueryWrapper(bo);
+        Page<StudentMindOldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询学生心理健康历史信息列表
+     */
+    @Override
+    public List<StudentMindOldVo> queryList(StudentMindOldBo bo) {
+        LambdaQueryWrapper<StudentMindOld> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<StudentMindOld> buildQueryWrapper(StudentMindOldBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<StudentMindOld> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getStudentId() != null, StudentMindOld::getStudentId, bo.getStudentId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), StudentMindOld::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), StudentMindOld::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), StudentMindOld::getAge, bo.getAge());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchool()), StudentMindOld::getSchool, bo.getSchool());
+        lqw.eq(StringUtils.isNotBlank(bo.getStudentNumber()), StudentMindOld::getStudentNumber, bo.getStudentNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), StudentMindOld::getIdCard, bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getMind()), StudentMindOld::getMind, bo.getMind());
+        lqw.eq(StringUtils.isNotBlank(bo.getPsychologicalDescription()), StudentMindOld::getPsychologicalDescription, bo.getPsychologicalDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateType()), StudentMindOld::getCreateType, bo.getCreateType());
+        return lqw;
+    }
+
+    /**
+     * 新增学生心理健康历史信息
+     */
+    @Override
+    public Boolean insertByBo(StudentMindOldBo bo) {
+        StudentMindOld add = MapstructUtils.convert(bo, StudentMindOld.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setMindId(add.getMindId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学生心理健康历史信息
+     */
+    @Override
+    public Boolean updateByBo(StudentMindOldBo bo) {
+        StudentMindOld update = MapstructUtils.convert(bo, StudentMindOld.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(StudentMindOld entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除学生心理健康历史信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/TeacherInfoServiceImpl.java

@@ -0,0 +1,128 @@
+package org.dromara.system.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.system.domain.bo.TeacherInfoBo;
+import org.dromara.system.domain.vo.TeacherInfoVo;
+import org.dromara.system.domain.TeacherInfo;
+import org.dromara.system.mapper.TeacherInfoMapper;
+import org.dromara.system.service.ITeacherInfoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 老师档案信息Service业务层处理
+ *
+ * @author boman
+ * @date 2023-08-16
+ */
+@RequiredArgsConstructor
+@Service
+public class TeacherInfoServiceImpl implements ITeacherInfoService {
+
+    private final TeacherInfoMapper baseMapper;
+
+    /**
+     * 查询老师档案信息
+     */
+    @Override
+    public TeacherInfoVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询老师档案信息列表
+     */
+    @Override
+    public TableDataInfo<TeacherInfoVo> queryPageList(TeacherInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TeacherInfo> lqw = buildQueryWrapper(bo);
+        Page<TeacherInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询老师档案信息列表
+     */
+    @Override
+    public List<TeacherInfoVo> queryList(TeacherInfoBo bo) {
+        LambdaQueryWrapper<TeacherInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TeacherInfo> buildQueryWrapper(TeacherInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TeacherInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getTeacherId() != null, TeacherInfo::getTeacherId, bo.getTeacherId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), TeacherInfo::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), TeacherInfo::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), TeacherInfo::getAge, bo.getAge());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), TeacherInfo::getPhone, bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getProfessional()), TeacherInfo::getProfessional, bo.getProfessional());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), TeacherInfo::getIdCard, bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeight()), TeacherInfo::getHeight, bo.getHeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getWeight()), TeacherInfo::getWeight, bo.getWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getBloodType()), TeacherInfo::getBloodType, bo.getBloodType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPoliticalStatus()), TeacherInfo::getPoliticalStatus, bo.getPoliticalStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getGraduationPhoto()), TeacherInfo::getGraduationPhoto, bo.getGraduationPhoto());
+        lqw.eq(StringUtils.isNotBlank(bo.getDegreePhoto()), TeacherInfo::getDegreePhoto, bo.getDegreePhoto());
+        lqw.eq(StringUtils.isNotBlank(bo.getTeachingPhoto()), TeacherInfo::getTeachingPhoto, bo.getTeachingPhoto());
+        lqw.eq(StringUtils.isNotBlank(bo.getProfessionalPhoto()), TeacherInfo::getProfessionalPhoto, bo.getProfessionalPhoto());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdentificationPhoto()), TeacherInfo::getIdentificationPhoto, bo.getIdentificationPhoto());
+        lqw.eq(StringUtils.isNotBlank(bo.getEntrancePermit()), TeacherInfo::getEntrancePermit, bo.getEntrancePermit());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddress()), TeacherInfo::getAddress, bo.getAddress());
+        lqw.eq(bo.getOnBoardTime() != null, TeacherInfo::getOnBoardTime, bo.getOnBoardTime());
+        lqw.eq(bo.getJobTime() != null, TeacherInfo::getJobTime, bo.getJobTime());
+        return lqw;
+    }
+
+    /**
+     * 新增老师档案信息
+     */
+    @Override
+    public Boolean insertByBo(TeacherInfoBo bo) {
+        TeacherInfo add = MapstructUtils.convert(bo, TeacherInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改老师档案信息
+     */
+    @Override
+    public Boolean updateByBo(TeacherInfoBo bo) {
+        TeacherInfo update = MapstructUtils.convert(bo, TeacherInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(TeacherInfo entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除老师档案信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ZhxyShyjServiceImpl.java

@@ -46,26 +46,26 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
 
     private final RegisterSchoolFileMapper registerSchoolFileMapper;
 
-    private RegisterTeacherMapper registerTeacherMapper;
-    private RegisterParentsMapper registerParentsMapper;
+    private final RegisterTeacherMapper registerTeacherMapper;
+    private final RegisterParentsMapper registerParentsMapper;
 
-    private IRegisterTeacherClassService registerTeacherClassService;
-    private RegisterTeacherClassMapper registerTeacherClassMapper;
+    private final IRegisterTeacherClassService registerTeacherClassService;
+    private final RegisterTeacherClassMapper registerTeacherClassMapper;
 
-    private FormalTeacherClassMapper formalTeacherClassMapper;
+    private final FormalTeacherClassMapper formalTeacherClassMapper;
 
-    private IRegisterParentsStudentService registerParentsStudentService;
-    private RegisterParentsStudentMapper registerParentsStudentMapper;
+    private final IRegisterParentsStudentService registerParentsStudentService;
+    private final RegisterParentsStudentMapper registerParentsStudentMapper;
 
-    private FormalParentsStudentMapper formalParentsStudentMapper;
-    private IFormalParentsStudentService formalParentsStudentService;
+    private final FormalParentsStudentMapper formalParentsStudentMapper;
+    private final IFormalParentsStudentService formalParentsStudentService;
 
     private final SysTenantMapper sysTenantMapper;
 
     private final SysDeptMapper sysDeptMapper;
 
-    private SysUserMapper userMapper;
-    private SysUserServiceImpl sysUserServiceImpl;
+    private final SysUserMapper userMapper;
+    private final SysUserServiceImpl sysUserServiceImpl;
 
     /**
      * 查询智慧校园_审核意见
@@ -97,7 +97,6 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
     private LambdaQueryWrapper<ZhxyShyj> buildQueryWrapper(ZhxyShyjBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZhxyShyj> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getTeacherId() != null, ZhxyShyj::getTeacherId, bo.getTeacherId());
         lqw.eq(bo.getDataId() != null, ZhxyShyj::getDataId, bo.getDataId());
         lqw.eq(StringUtils.isNotBlank(bo.getType()), ZhxyShyj::getType, bo.getType());
         lqw.eq(bo.getAuditId() != null, ZhxyShyj::getAuditId, bo.getAuditId());
@@ -164,7 +163,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 dept.setAncestors("0");
                 dept.setDeptName(registerSchool.getSchoolName());
                 //查询最新的ParentId为100的数据
-                SysDept sysDept = sysDeptMapper.selectDeptByParentId(0L);
+                SysDeptVo sysDept = sysDeptMapper.selectDeptByParentId(0L);
                 dept.setOrderNum(sysDept.getOrderNum()+1);
                 dept.setPhone(registerSchool.getUserPhone());
                 dept.setCreateTime(DateUtils.getNowDate());
@@ -181,8 +180,10 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     use.setPhonenumber(registerSchool.getUserPhone());
                     use.setPassword(BCrypt.hashpw("1qaz!QAZ"));
                     use.setCreateTime(DateUtils.getNowDate());
+                    use.setTenantId(sysTenant.getTenantId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
                     userMapper.insert(sysUser);
+                    use.setUserId(sysUser.getUserId());
                 }else{
                     use.setDeptId(dept.getDeptId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
@@ -234,6 +235,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     use.setCreateTime(DateUtils.getNowDate());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
                     userMapper.insert(sysUser);
+                    use.setUserId(sysUser.getUserId());
                 }else{
                     use.setDeptId(registerTeacher.getSchoolId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
@@ -307,6 +309,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     sysUser.setCreateTime(DateUtils.getNowDate());
                     SysUser use = MapstructUtils.convert(sysUser, SysUser.class);
                     userMapper.insert(use);
+                    sysUser.setUserId(use.getUserId());
                     //新增用户与角色管理
                     Long[] roleIds = {5L};
                     sysUserServiceImpl.insertUserRole(sysUser.getUserId(), roleIds,false);

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StudentInfoMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.system.mapper.StudentInfoMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StudentInfoOldMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.system.mapper.StudentInfoOldMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StudentLiveOldMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.system.mapper.StudentLiveOldMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StudentMindOldMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.system.mapper.StudentMindOldMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -34,7 +34,7 @@
 
 
     <select id="selectDeptByParentId" parameterType="Long" resultMap="SysDeptResult">
-        select * from sys_dept
+        <include refid="selectDeptVo"/>
         where parent_id = #{parentId} order by create_time desc limit 1
     </select>
     <select id="selectDeptListChildren" resultMap="SysDeptResult" parameterType="SysDept">

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/TeacherInfoMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.system.mapper.TeacherInfoMapper">
+
+</mapper>