Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,7 @@
 package org.dromara.system.controller.info;
 
 import java.util.List;
+import java.util.Map;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
@@ -76,7 +77,7 @@ public class StudentInfoController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody StudentInfoBo bo) {
-        return toAjax(studentInfoService.insertByBo(bo));
+        return studentInfoService.insertByBo(bo);
     }
 
     /**
@@ -102,4 +103,13 @@ public class StudentInfoController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(studentInfoService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 统计学生档案信息
+     */
+    @GetMapping("/statistics")
+    public R<Map<String,Object>> statistics(StudentInfoBo bo)
+    {
+        return studentInfoService.statistics(bo);
+    }
 }

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

@@ -1,11 +1,13 @@
 package org.dromara.system.controller.info;
 
 import java.util.List;
+import java.util.Map;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.system.domain.bo.StudentLiveOldBo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -31,7 +33,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/infoOld")
+@RequestMapping("/student/old")
 public class StudentInfoOldController extends BaseController {
 
     private final IStudentInfoOldService studentInfoOldService;
@@ -39,7 +41,7 @@ public class StudentInfoOldController extends BaseController {
     /**
      * 查询学生档案历史信息列表
      */
-    @SaCheckPermission("system:infoOld:list")
+    @SaCheckPermission("student:old:list")
     @GetMapping("/list")
     public TableDataInfo<StudentInfoOldVo> list(StudentInfoOldBo bo, PageQuery pageQuery) {
         return studentInfoOldService.queryPageList(bo, pageQuery);
@@ -48,7 +50,7 @@ public class StudentInfoOldController extends BaseController {
     /**
      * 导出学生档案历史信息列表
      */
-    @SaCheckPermission("system:infoOld:export")
+    @SaCheckPermission("student:old:export")
     @Log(title = "学生档案历史信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StudentInfoOldBo bo, HttpServletResponse response) {
@@ -61,7 +63,7 @@ public class StudentInfoOldController extends BaseController {
      *
      * @param oldId 主键
      */
-    @SaCheckPermission("system:infoOld:query")
+    @SaCheckPermission("student:old:query")
     @GetMapping("/{oldId}")
     public R<StudentInfoOldVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long oldId) {
@@ -71,7 +73,7 @@ public class StudentInfoOldController extends BaseController {
     /**
      * 新增学生档案历史信息
      */
-    @SaCheckPermission("system:infoOld:add")
+    @SaCheckPermission("student:old:add")
     @Log(title = "学生档案历史信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +84,7 @@ public class StudentInfoOldController extends BaseController {
     /**
      * 修改学生档案历史信息
      */
-    @SaCheckPermission("system:infoOld:edit")
+    @SaCheckPermission("student:old:edit")
     @Log(title = "学生档案历史信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -95,11 +97,20 @@ public class StudentInfoOldController extends BaseController {
      *
      * @param oldIds 主键串
      */
-    @SaCheckPermission("system:infoOld:remove")
+    @SaCheckPermission("student:old: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));
     }
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    @GetMapping("/echarts")
+    public R<Map<String, Object>> echarts(StudentLiveOldBo bo)
+    {
+        return studentInfoOldService.selectStudentInfoOldListEcharts(bo);
+    }
 }

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

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/liveOld")
+@RequestMapping("/live/old")
 public class StudentLiveOldController extends BaseController {
 
     private final IStudentLiveOldService studentLiveOldService;
@@ -39,7 +39,7 @@ public class StudentLiveOldController extends BaseController {
     /**
      * 查询学生生活历史信息列表
      */
-    @SaCheckPermission("system:liveOld:list")
+    @SaCheckPermission("live:old:list")
     @GetMapping("/list")
     public TableDataInfo<StudentLiveOldVo> list(StudentLiveOldBo bo, PageQuery pageQuery) {
         return studentLiveOldService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class StudentLiveOldController extends BaseController {
     /**
      * 导出学生生活历史信息列表
      */
-    @SaCheckPermission("system:liveOld:export")
+    @SaCheckPermission("live:old:export")
     @Log(title = "学生生活历史信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StudentLiveOldBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class StudentLiveOldController extends BaseController {
      *
      * @param liveId 主键
      */
-    @SaCheckPermission("system:liveOld:query")
+    @SaCheckPermission("live:old:query")
     @GetMapping("/{liveId}")
     public R<StudentLiveOldVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long liveId) {
@@ -71,7 +71,7 @@ public class StudentLiveOldController extends BaseController {
     /**
      * 新增学生生活历史信息
      */
-    @SaCheckPermission("system:liveOld:add")
+    @SaCheckPermission("live:old:add")
     @Log(title = "学生生活历史信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +82,7 @@ public class StudentLiveOldController extends BaseController {
     /**
      * 修改学生生活历史信息
      */
-    @SaCheckPermission("system:liveOld:edit")
+    @SaCheckPermission("live:old:edit")
     @Log(title = "学生生活历史信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -95,7 +95,7 @@ public class StudentLiveOldController extends BaseController {
      *
      * @param liveIds 主键串
      */
-    @SaCheckPermission("system:liveOld:remove")
+    @SaCheckPermission("live:old:remove")
     @Log(title = "学生生活历史信息", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{liveIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/mindOld")
+@RequestMapping("/mind/old")
 public class StudentMindOldController extends BaseController {
 
     private final IStudentMindOldService studentMindOldService;
@@ -39,7 +39,7 @@ public class StudentMindOldController extends BaseController {
     /**
      * 查询学生心理健康历史信息列表
      */
-    @SaCheckPermission("system:mindOld:list")
+    @SaCheckPermission("mind:old:list")
     @GetMapping("/list")
     public TableDataInfo<StudentMindOldVo> list(StudentMindOldBo bo, PageQuery pageQuery) {
         return studentMindOldService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class StudentMindOldController extends BaseController {
     /**
      * 导出学生心理健康历史信息列表
      */
-    @SaCheckPermission("system:mindOld:export")
+    @SaCheckPermission("mind:old:export")
     @Log(title = "学生心理健康历史信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StudentMindOldBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class StudentMindOldController extends BaseController {
      *
      * @param mindId 主键
      */
-    @SaCheckPermission("system:mindOld:query")
+    @SaCheckPermission("mind:old:query")
     @GetMapping("/{mindId}")
     public R<StudentMindOldVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long mindId) {
@@ -71,7 +71,7 @@ public class StudentMindOldController extends BaseController {
     /**
      * 新增学生心理健康历史信息
      */
-    @SaCheckPermission("system:mindOld:add")
+    @SaCheckPermission("mind:old:add")
     @Log(title = "学生心理健康历史信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +82,7 @@ public class StudentMindOldController extends BaseController {
     /**
      * 修改学生心理健康历史信息
      */
-    @SaCheckPermission("system:mindOld:edit")
+    @SaCheckPermission("mind:old:edit")
     @Log(title = "学生心理健康历史信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/put")
@@ -95,7 +95,7 @@ public class StudentMindOldController extends BaseController {
      *
      * @param mindIds 主键串
      */
-    @SaCheckPermission("system:mindOld:remove")
+    @SaCheckPermission("mind:old:remove")
     @Log(title = "学生心理健康历史信息", businessType = BusinessType.DELETE)
     @GetMapping("/delete/{mindIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -76,7 +76,7 @@ public class TeacherInfoController extends BaseController {
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody TeacherInfoBo bo) {
-        return toAjax(teacherInfoService.insertByBo(bo));
+        return teacherInfoService.insertByBo(bo);
     }
 
     /**

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

@@ -2,10 +2,12 @@ package org.dromara.system.controller.register;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaCheckRole;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.core.constant.TenantConstants;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -48,6 +50,7 @@ public class RegisterTeacherClassController extends BaseController {
     /**
      * 导出注册-老师-班级（学科）列表
      */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("register:class:export")
     @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.EXPORT)
     @PostMapping("/export")

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

@@ -2,10 +2,14 @@ package org.dromara.system.controller.register;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.core.constant.TenantConstants;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -39,6 +43,7 @@ public class RegisterTeacherController extends BaseController {
     /**
      * 查询注册-老师列表
      */
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @GetMapping("/list")
     public TableDataInfo<RegisterTeacherVo> list(RegisterTeacherBo bo, PageQuery pageQuery) {
         return registerTeacherService.queryPageList(bo, pageQuery);

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

@@ -112,7 +112,7 @@ public class SysDeptController extends BaseController {
      */
     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public R<Void> edit(@Validated @RequestBody SysDeptBo dept) {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
@@ -137,7 +137,7 @@ public class SysDeptController extends BaseController {
      */
     @SaCheckPermission("system:dept:remove")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{deptId}")
+    @GetMapping("/delete/{deptId}")
     public R<Void> remove(@PathVariable Long deptId) {
         if (deptService.hasChildByDeptId(deptId)) {
             return R.warn("存在下级部门,不允许删除");

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

@@ -8,10 +8,12 @@ import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.dto.RoleDTO;
 import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.ClassUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -29,6 +31,7 @@ import org.dromara.system.domain.vo.*;
 import org.dromara.system.listener.SysUserImportListener;
 import org.dromara.system.mapper.FormalParentsStudentMapper;
 import org.dromara.system.mapper.FormalTeacherClassMapper;
+import org.dromara.system.mapper.SysMenuMapper;
 import org.dromara.system.service.*;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +40,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 用户信息
@@ -61,6 +65,8 @@ public class SysUserController extends BaseController {
 
     private final FormalParentsStudentMapper formalParentsStudentMapper;
 
+    private final SysMenuMapper sysMenuMapper;
+
     /**
      * 获取用户列表
      */
@@ -109,6 +115,7 @@ public class SysUserController extends BaseController {
      *
      * @return 用户信息
      */
+    @SneakyThrows
     @GetMapping("/getInfo")
     public R<UserInfoVo> getInfo() {
         UserInfoVo userInfoVo = new UserInfoVo();
@@ -117,20 +124,35 @@ public class SysUserController extends BaseController {
             // 超级管理员 如果重新加载用户信息需清除动态租户
             TenantHelper.clearDynamic();
         }
+
         SysUserVo user = userService.selectUserById(loginUser.getUserId());
-        //List<RoleDTO> roles = loginUser.getRoles();
+        SysDeptVo dept = new SysDeptVo();
+        dept.setDeptId(loginUser.getDeptId());
+        dept.setDeptName(loginUser.getDeptName());
+        user.setDept(dept);
 
+        List<RoleDTO> rolesTo = loginUser.getRoles();
+        List<SysRoleVo> roles = new ArrayList<>();
+        for (RoleDTO roleDTO : rolesTo) {
+            SysRoleVo role = new SysRoleVo();
+            ClassUtils.copyProperties(roleDTO, role);
+            //查询角色权限
+            Set<String> permissions = sysMenuMapper.getMenuListByRoleId(roleDTO.getRoleId());
+            role.setPermissions(permissions);
+            roles.add(role);
+        }
+        user.setRoles(roles);
         userInfoVo.setUser(user);
         userInfoVo.setPermissions(loginUser.getMenuPermission());
         userInfoVo.setRoles(loginUser.getRolePermission());
 
         if (loginUser.getRoles() != null && loginUser.getRoles().size() > 0){
             for (RoleDTO role : loginUser.getRoles()) {
-                if ("teacher".equals(role)){
-                    getTeacherClass(userInfoVo);
+                if ("teacher".equals(role.getRoleKey())){
+                    getTeacherClass(user);
                 }
-                if("parents".equals(role)){
-                    getParentsStudent(userInfoVo);
+                if("parents".equals(role.getRoleKey())){
+                    getParentsStudent(user);
                 }
             }
         }
@@ -147,14 +169,14 @@ public class SysUserController extends BaseController {
         return R.ok(userInfoVo);
     }
 
-    private void getTeacherClass(UserInfoVo user) {
-        List<FormalTeacherClassVo> teacherClass = formalTeacherClassMapper.getTeacherClass(String.valueOf(user.getUser().getUserId()));
+    private void getTeacherClass(SysUserVo user) {
+        List<FormalTeacherClassVo> teacherClass = formalTeacherClassMapper.getTeacherClass(String.valueOf(user.getUserId()));
         user.setTeacherClass(teacherClass);
     }
 
-    private void getParentsStudent(UserInfoVo user) {
+    private void getParentsStudent(SysUserVo user) {
 
-        List<FormalParentsStudentVo> parentsStudent = formalParentsStudentMapper.getStudentByParentId(String.valueOf(user.getUser().getUserId()));
+        List<FormalParentsStudentVo> parentsStudent = formalParentsStudentMapper.getStudentByParentId(String.valueOf(user .getUserId()));
         user.setParentsStudent(parentsStudent);
     }
 

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

@@ -27,6 +27,11 @@ public class RegisterParents extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */

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

@@ -27,6 +27,11 @@ public class RegisterParentsStudent extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 家长id
      */

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

@@ -27,6 +27,11 @@ public class RegisterSchool extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */
@@ -53,7 +58,7 @@ public class RegisterSchool extends BaseEntity {
     private String isPass;
 
     /**
-     * 
+     *
      */
     private Long auditId;
 

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

@@ -22,11 +22,16 @@ public class RegisterSchoolFile extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 学校ID
      */

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

@@ -27,6 +27,11 @@ public class RegisterTeacher extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */

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

@@ -27,6 +27,11 @@ public class RegisterTeacherClass extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 老师id
      */
@@ -43,7 +48,7 @@ public class RegisterTeacherClass extends BaseEntity {
     private String className;
 
     /**
-     * 
+     *
      */
     private String period;
 

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

@@ -202,5 +202,7 @@ public class StudentInfo extends BaseEntity {
      */
     private String isPoverty;
 
+    private Long createDept;
+
 
 }

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

@@ -82,5 +82,7 @@ public class StudentLiveOld extends BaseEntity {
      */
     private String remark;
 
+    private String createByName;
+
 
 }

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

@@ -82,5 +82,7 @@ public class StudentMindOld extends BaseEntity {
      */
     private String remark;
 
+    private String createByName;
+
 
 }

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

@@ -29,6 +29,8 @@ public class SysDept extends TenantEntity {
     @TableId(value = "dept_id")
     private Long deptId;
 
+    private String tenantId;
+
     /**
      * 父部门ID
      */

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

@@ -31,6 +31,8 @@ public class CourseChangeBo extends BaseEntity {
      */
     private Long id;
 
+
+
     /**
      * 申请人id
      */
@@ -44,7 +46,8 @@ public class CourseChangeBo extends BaseEntity {
     /**
      * 申请时间
      */
-    @NotNull(message = "申请时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "申请时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date applyTime;
 
     /**
@@ -75,6 +78,7 @@ public class CourseChangeBo extends BaseEntity {
      * 调课科目的上课时间
      */
     //@NotNull(message = "调课科目的上课时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date subjectTime;
 
     /**
@@ -111,6 +115,7 @@ public class CourseChangeBo extends BaseEntity {
      * 被调课科目的上课时间
      */
     //@NotNull(message = "被调课科目的上课时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date beSubjectTime;
 
     /**

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

@@ -29,6 +29,11 @@ public class RegisterParentsBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */

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

@@ -28,6 +28,11 @@ public class RegisterParentsStudentBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 家长id
      */

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

@@ -27,9 +27,14 @@ public class RegisterSchoolBo extends BaseEntity {
     /**
      * ID
      */
-    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "ID不能为空", groups = { EditGroup.class })
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */

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

@@ -21,45 +21,50 @@ import jakarta.validation.constraints.*;
 public class RegisterSchoolFileBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 学校ID
      */
-    @NotNull(message = "学校ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "学校ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long schoolId;
 
     /**
      * 学校部门id
      */
-    @NotNull(message = "学校部门id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "学校部门id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long deptId;
 
     /**
      * 附件名称
      */
-    @NotBlank(message = "附件名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "附件名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 附件地址
      */
-    @NotBlank(message = "附件地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "附件地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String url;
 
     /**
      * 地址类型
      */
-    @NotBlank(message = "地址类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "地址类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 备注
      */
-    @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/bo/RegisterTeacherBo.java

@@ -34,6 +34,13 @@ public class RegisterTeacherBo extends BaseEntity {
      */
     private String openId;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+
+
     /**
      * 学校id
      */

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

@@ -25,43 +25,48 @@ public class RegisterTeacherClassBo extends BaseEntity {
     /**
      * ID
      */
-    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    //@NotNull(message = "ID不能为空", groups = { EditGroup.class })
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 老师id
      */
-    @NotNull(message = "老师id不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@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 classId;
 
     /**
      * 班级名称
      */
-    @NotBlank(message = "班级名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "班级名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String className;
 
     /**
      *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String period;
 
     /**
      * 学科
      */
-    @NotBlank(message = "学科不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "学科不能为空", groups = { AddGroup.class, EditGroup.class })
     private String discipline;
 
     /**
      * 备注
      */
-    @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/bo/StudentInfoBo.java

@@ -1,5 +1,6 @@
 package org.dromara.system.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.system.domain.StudentInfo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -26,6 +27,8 @@ public class StudentInfoBo extends BaseEntity {
     //@NotNull(message = "ID不能为空", groups = { EditGroup.class })
     private Long id;
 
+    private String tenantId;
+
     /**
      * 学生id（家长-学生(审核通过之后数据)表id）
      */
@@ -236,8 +239,11 @@ public class StudentInfoBo extends BaseEntity {
     //@NotBlank(message = "是否贫困不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isPoverty;
 
-    private String classId;
+    private Long createDept;
 
+    @TableField(exist = false)
+    private String classId;
+    @TableField(exist = false)
     private Long parentsId;
 
 

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

@@ -35,205 +35,205 @@ public class StudentInfoOldBo extends BaseEntity {
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 性别(1：男，2：女)
      */
-    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sex;
 
     /**
      * 年龄
      */
-    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
     private String age;
 
     /**
      * 名族
      */
-    @NotBlank(message = "名族不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "名族不能为空", groups = { AddGroup.class, EditGroup.class })
     private String familyName;
 
     /**
      * 学校
      */
-    @NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
     private String school;
 
     /**
      * 学号
      */
-    @NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String studentNumber;
 
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String idCard;
 
     /**
      * 是否近视（1：是，2：否）
      */
-    @NotBlank(message = "是否近视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "是否近视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isNearsightedness;
 
     /**
      * 近视度数
      */
-    @NotBlank(message = "近视度数不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "近视度数不能为空", groups = { AddGroup.class, EditGroup.class })
     private String degreeMyopia;
 
     /**
      * 是否远视（1：是，2：否）
      */
-    @NotBlank(message = "是否远视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "是否远视（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isFarsightedness;
 
     /**
      * 远视度数
      */
-    @NotBlank(message = "远视度数不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "远视度数不能为空", groups = { AddGroup.class, EditGroup.class })
     private String farsightedness;
 
     /**
      * 身高
      */
-    @NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
     private String height;
 
     /**
      * 体重
      */
-    @NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
     private String weight;
 
     /**
      * 血型
      */
-    @NotBlank(message = "血型不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "血型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bloodType;
 
     /**
      * 政治面貌
      */
-    @NotBlank(message = "政治面貌不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "政治面貌不能为空", groups = { AddGroup.class, EditGroup.class })
     private String politicalStatus;
 
     /**
      * 健康状况
      */
-    @NotBlank(message = "健康状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "健康状况不能为空", groups = { AddGroup.class, EditGroup.class })
     private String health;
 
     /**
      * 证件照(地址)
      */
-    @NotBlank(message = "证件照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "证件照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String identificationPhoto;
 
     /**
      * 心理状况
      */
-    @NotBlank(message = "心理状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "心理状况不能为空", groups = { AddGroup.class, EditGroup.class })
     private String mind;
 
     /**
      * 门禁照(地址)
      */
-    @NotBlank(message = "门禁照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "门禁照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String entrancePermit;
 
     /**
      * 父亲
      */
-    @NotBlank(message = "父亲不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "父亲不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fatherName;
 
     /**
      * 父亲联系方式
      */
-    @NotBlank(message = "父亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "父亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String fatherTelephone;
 
     /**
      * 母亲
      */
-    @NotBlank(message = "母亲不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "母亲不能为空", groups = { AddGroup.class, EditGroup.class })
     private String motherName;
 
     /**
      * 母亲联系方式
      */
-    @NotBlank(message = "母亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "母亲联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String motherTelephone;
 
     /**
      * 居住地址
      */
-    @NotBlank(message = "居住地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "居住地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String address;
 
     /**
      * 经度
      */
-    @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String longitude;
 
     /**
      * 纬度
      */
-    @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String latitude;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 有无过往病史（1：有，2：无）
      */
-    @NotBlank(message = "有无过往病史（1：有，2：无）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "有无过往病史（1：有，2：无）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isMedicalHistory;
 
     /**
      * 病史描述
      */
-    @NotBlank(message = "病史描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "病史描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String medicalDescription;
 
     /**
      * 心理健康描述
      */
-    @NotBlank(message = "心理健康描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "心理健康描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String psychologicalDescription;
 
     /**
      * 留守儿童（1：是，2：否）
      */
-    @NotBlank(message = "留守儿童（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "留守儿童（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isLset;
 
     /**
      * 是否贫困（1：是，2：否）
      */
-    @NotBlank(message = "是否贫困（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "是否贫困（1：是，2：否）不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isPoverty;
 
     /**
      * 紧急联系人
      */
-    @NotBlank(message = "紧急联系人不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "紧急联系人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String emergencyContact;
 
     /**
      * 紧急联系人手机号
      */
-    @NotBlank(message = "紧急联系人手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "紧急联系人手机号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String emergencyContactTelephone;
 
 

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

@@ -35,62 +35,64 @@ public class StudentLiveOldBo extends BaseEntity {
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 性别(1：男，2：女)
      */
-    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sex;
 
     /**
      * 年龄
      */
-    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
     private String age;
 
     /**
      * 学校
      */
-    @NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
     private String school;
 
     /**
      * 学号
      */
-    @NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String studentNumber;
 
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String idCard;
 
     /**
      * 身高
      */
-    @NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
     private String height;
 
     /**
      * 体重
      */
-    @NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
     private String weight;
 
     /**
      * 1：家长，2：老师
      */
-    @NotBlank(message = "1：家长，2：老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "1：家长，2：老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String createType;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    private String createByName;
+
 
 }

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

@@ -35,62 +35,64 @@ public class StudentMindOldBo extends BaseEntity {
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 性别(1：男，2：女)
      */
-    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sex;
 
     /**
      * 年龄
      */
-    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
     private String age;
 
     /**
      * 学校
      */
-    @NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "学校不能为空", groups = { AddGroup.class, EditGroup.class })
     private String school;
 
     /**
      * 学号
      */
-    @NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "学号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String studentNumber;
 
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String idCard;
 
     /**
      * 心理状况
      */
-    @NotBlank(message = "心理状况不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "心理状况不能为空", groups = { AddGroup.class, EditGroup.class })
     private String mind;
 
     /**
      * 心理健康描述
      */
-    @NotBlank(message = "心理健康描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "心理健康描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String psychologicalDescription;
 
     /**
      * 1：家长，2：老师
      */
-    @NotBlank(message = "1：家长，2：老师不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "1：家长，2：老师不能为空", groups = { AddGroup.class, EditGroup.class })
     private String createType;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    private String createByName;
+
 
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.system.domain.TeacherInfo;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -37,103 +38,103 @@ public class TeacherInfoBo extends BaseEntity {
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 性别(1：男，2：女)
      */
-    @NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "性别(1：男，2：女)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sex;
 
     /**
      * 年龄
      */
-    @NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "年龄不能为空", groups = { AddGroup.class, EditGroup.class })
     private String age;
 
     /**
      * 联系方式
      */
-    @NotBlank(message = "联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "联系方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String phone;
 
     /**
      * 职称
      */
-    @NotBlank(message = "职称不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "职称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String professional;
 
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String idCard;
 
     /**
      * 身高
      */
-    @NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "身高不能为空", groups = { AddGroup.class, EditGroup.class })
     private String height;
 
     /**
      * 体重
      */
-    @NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "体重不能为空", groups = { AddGroup.class, EditGroup.class })
     private String weight;
 
     /**
      * 血型
      */
-    @NotBlank(message = "血型不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "血型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bloodType;
 
     /**
      * 政治面貌
      */
-    @NotBlank(message = "政治面貌不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "政治面貌不能为空", groups = { AddGroup.class, EditGroup.class })
     private String politicalStatus;
 
     /**
      * 毕业证明照(地址)
      */
-    @NotBlank(message = "毕业证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "毕业证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String graduationPhoto;
 
     /**
      * 毕业证书照(地址)
      */
-    @NotBlank(message = "毕业证书照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "毕业证书照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String degreePhoto;
 
     /**
      * 教资证明照(地址)
      */
-    @NotBlank(message = "教资证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "教资证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String teachingPhoto;
 
     /**
      * 职称证明照(地址)
      */
-    @NotBlank(message = "职称证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "职称证明照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String professionalPhoto;
 
     /**
      * 证件照(地址)
      */
-    @NotBlank(message = "证件照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "证件照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String identificationPhoto;
 
     /**
      * 门禁照(地址)
      */
-    @NotBlank(message = "门禁照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "门禁照(地址)不能为空", groups = { AddGroup.class, EditGroup.class })
     private String entrancePermit;
 
     /**
      * 居住地址
      */
-    @NotBlank(message = "居住地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "居住地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String address;
 
     /**
@@ -151,8 +152,11 @@ public class TeacherInfoBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    @TableField(exist = false)
+    private Long schoolId;
+
 
 }

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

@@ -34,6 +34,11 @@ public class RegisterParentsStudentVo implements Serializable {
     @ExcelProperty(value = "ID")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 家长id
      */

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

@@ -35,6 +35,11 @@ public class RegisterParentsVo implements Serializable {
     @ExcelProperty(value = "ID")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */

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

@@ -29,11 +29,16 @@ public class RegisterSchoolFileVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 学校ID
      */

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

@@ -35,6 +35,11 @@ public class RegisterSchoolVo implements Serializable {
     @ExcelProperty(value = "ID")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */

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

@@ -34,6 +34,11 @@ public class RegisterTeacherClassVo implements Serializable {
     @ExcelProperty(value = "ID")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
     /**
      * 老师id
      */

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

@@ -35,6 +35,12 @@ public class RegisterTeacherVo implements Serializable {
     @ExcelProperty(value = "ID")
     private Long id;
 
+    /**
+     * 租户编号
+     */
+    @ExcelProperty(value = "租户编号")
+    private String tenantId;
+
     /**
      * 微信用户唯一标识 OpenID
      */

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

@@ -249,5 +249,27 @@ public class StudentInfoVo implements Serializable {
     @ExcelProperty(value = "是否贫困")
     private String isPoverty;
 
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
 
 }

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

@@ -101,5 +101,27 @@ public class StudentLiveOldVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private String createByName;
+
 
 }

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

@@ -101,5 +101,27 @@ public class StudentMindOldVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    private String createByName;
+
 
 }

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

@@ -31,6 +31,8 @@ public class SysDeptVo implements Serializable {
     @ExcelProperty(value = "部门id")
     private Long deptId;
 
+    private String tenantId;
+
     /**
      * 父部门id
      */

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

@@ -71,7 +71,7 @@ public class SysUserVo implements Serializable {
     /**
      * 手机号码
      */
-    @Sensitive(strategy = SensitiveStrategy.PHONE)
+    //@Sensitive(strategy = SensitiveStrategy.PHONE)
     private String phonenumber;
 
     /**
@@ -142,4 +142,8 @@ public class SysUserVo implements Serializable {
      */
     private Long roleId;
 
+    private List<FormalTeacherClassVo> teacherClass;
+
+    private List<FormalParentsStudentVo> parentsStudent;
+
 }

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

@@ -1,6 +1,8 @@
 package org.dromara.system.domain.vo;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.dromara.system.domain.TeacherInfo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
@@ -162,5 +164,26 @@ public class TeacherInfoVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
 
+    @TableField(exist = false)
+    private Long schoolId;
 }

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

@@ -1,5 +1,10 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.RegisterTeacher;
 import org.dromara.system.domain.vo.RegisterTeacherVo;
@@ -19,4 +24,7 @@ public interface RegisterTeacherMapper extends BaseMapperPlus<RegisterTeacher, R
     List<RegisterTeacherVo> selectRegisterTeacherListByTime(@Param("monthFirst") String monthFirst, @Param("deptId")Long deptId);
 
     RegisterTeacherVo selectRegisterTeacherByPhonenumber(String phonenumber);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<RegisterTeacherVo> selectListZ(IPage<RegisterTeacher> page, @Param(Constants.WRAPPER)LambdaQueryWrapper<RegisterTeacher> lqw);
 }

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

@@ -1,9 +1,20 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.StudentInfo;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.StudentInfoBo;
 import org.dromara.system.domain.vo.StudentInfoVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 学生档案信息Mapper接口
  *
@@ -12,4 +23,14 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface StudentInfoMapper extends BaseMapperPlus<StudentInfo, StudentInfoVo> {
 
+
+    @InterceptorIgnore(tenantLine = "1")
+    StudentInfoVo selectStudentInfoByStudentId(Long studentId);
+
+    @InterceptorIgnore(tenantLine = "1")
+    Page<StudentInfoVo> selectStudentInfoPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER) Wrapper<StudentInfo> queryWrapper);
+
+    @InterceptorIgnore(tenantLine = "1")
+    List<StudentInfoVo> selectStudentInfo(@Param(Constants.WRAPPER)QueryWrapper<StudentInfo> lqw);
 }
+

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

@@ -1,9 +1,16 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.StudentInfoOld;
 import org.dromara.system.domain.vo.StudentInfoOldVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 学生档案历史信息Mapper接口
  *
@@ -12,4 +19,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface StudentInfoOldMapper extends BaseMapperPlus<StudentInfoOld, StudentInfoOldVo> {
 
+    @InterceptorIgnore(tenantLine = "1")
+    Page<StudentInfoOldVo> selectVoMapperPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER)LambdaQueryWrapper<StudentInfoOld> lqw);
+
+    @InterceptorIgnore(tenantLine = "1")
+    List<StudentInfoOldVo> selectVoMapperList(@Param(Constants.WRAPPER)LambdaQueryWrapper<StudentInfoOld> lqw);
 }

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

@@ -1,9 +1,17 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.StudentLiveOld;
+import org.dromara.system.domain.bo.StudentLiveOldBo;
 import org.dromara.system.domain.vo.StudentLiveOldVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 学生生活历史信息Mapper接口
  *
@@ -12,4 +20,12 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface StudentLiveOldMapper extends BaseMapperPlus<StudentLiveOld, StudentLiveOldVo> {
 
+    @InterceptorIgnore(tenantLine = "1")
+    List<StudentLiveOldVo> selectStudentLiveOldListEcharts(StudentLiveOldBo bo);
+    @InterceptorIgnore(tenantLine = "1")
+    Page<StudentLiveOldVo> selectVoMapperPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER)LambdaQueryWrapper<StudentLiveOld> lqw);
+    @InterceptorIgnore(tenantLine = "1")
+    List<StudentLiveOldVo> selectVoMapperList(@Param(Constants.WRAPPER)LambdaQueryWrapper<StudentLiveOld> lqw);
+    @InterceptorIgnore(tenantLine = "1")
+    StudentLiveOldVo selectVoMapperById(Long liveId);
 }

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

@@ -1,9 +1,16 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.StudentMindOld;
 import org.dromara.system.domain.vo.StudentMindOldVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 学生心理健康历史信息Mapper接口
  *
@@ -12,4 +19,12 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface StudentMindOldMapper extends BaseMapperPlus<StudentMindOld, StudentMindOldVo> {
 
+    @InterceptorIgnore(tenantLine = "1")
+    Page<StudentMindOldVo> selectVoMapperPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER)LambdaQueryWrapper<StudentMindOld> lqw);
+
+    @InterceptorIgnore(tenantLine = "1")
+    StudentMindOldVo selectVoMapperById(Long mindId);
+
+    @InterceptorIgnore(tenantLine = "1")
+    List<StudentMindOldVo> selectVoMaooerList(@Param(Constants.WRAPPER)LambdaQueryWrapper<StudentMindOld> lqw);
 }

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

@@ -62,4 +62,7 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<SysDeptVo> selectDeptListMapper(SysDeptBo dept);
+
+    @InterceptorIgnore(tenantLine = "true")
+    SysDeptVo selectDeptByIdNoTenantId(Long deptId);
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -10,6 +11,7 @@ import org.dromara.system.domain.vo.SysMenuVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 菜单表 数据层
@@ -80,4 +82,6 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
      */
     List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
 
+    @InterceptorIgnore(tenantLine = "true")
+    Set<String> getMenuListByRoleId(Long roleId);
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -68,4 +69,6 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
      */
     List<SysRoleVo> selectRolesByUserName(String userName);
 
+    @InterceptorIgnore(tenantLine = "1")
+    Long selectRoleIdBytenantId(@Param("tenantId") String tenantId,@Param("roleKey")String roleKey);
 }

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

@@ -1,9 +1,17 @@
 package org.dromara.system.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.system.domain.TeacherInfo;
 import org.dromara.system.domain.vo.TeacherInfoVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+import java.util.List;
+
 /**
  * 老师档案信息Mapper接口
  *
@@ -12,4 +20,12 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface TeacherInfoMapper extends BaseMapperPlus<TeacherInfo, TeacherInfoVo> {
 
+    @InterceptorIgnore(tenantLine = "1")
+    TeacherInfoVo selectVoMapperById(Long id);
+
+    @InterceptorIgnore(tenantLine = "1")
+    Page<TeacherInfoVo> selectVoMapperPage(@Param("page")Page<Object> build, @Param(Constants.WRAPPER)QueryWrapper<TeacherInfo> lqw);
+
+    @InterceptorIgnore(tenantLine = "1")
+    List<TeacherInfoVo> selectVoMapperList(@Param(Constants.WRAPPER)QueryWrapper<TeacherInfo> lqw);
 }

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

@@ -1,6 +1,8 @@
 package org.dromara.system.service;
 
+import org.dromara.common.core.domain.R;
 import org.dromara.system.domain.StudentInfoOld;
+import org.dromara.system.domain.bo.StudentLiveOldBo;
 import org.dromara.system.domain.vo.StudentInfoOldVo;
 import org.dromara.system.domain.bo.StudentInfoOldBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,6 +10,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 学生档案历史信息Service接口
@@ -46,4 +49,6 @@ public interface IStudentInfoOldService {
      * 校验并批量删除学生档案历史信息信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    R<Map<String, Object>> selectStudentInfoOldListEcharts(StudentLiveOldBo bo);
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.service;
 
+import org.dromara.common.core.domain.R;
 import org.dromara.system.domain.StudentInfo;
 import org.dromara.system.domain.vo.StudentInfoVo;
 import org.dromara.system.domain.bo.StudentInfoBo;
@@ -8,6 +9,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 学生档案信息Service接口
@@ -35,7 +37,7 @@ public interface IStudentInfoService {
     /**
      * 新增学生档案信息
      */
-    Boolean insertByBo(StudentInfoBo bo);
+    R<Void> insertByBo(StudentInfoBo bo);
 
     /**
      * 修改学生档案信息
@@ -46,4 +48,6 @@ public interface IStudentInfoService {
      * 校验并批量删除学生档案信息信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    R<Map<String, Object>> statistics(StudentInfoBo bo);
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.system.service;
 
+import org.dromara.common.core.domain.R;
 import org.dromara.system.domain.TeacherInfo;
 import org.dromara.system.domain.vo.TeacherInfoVo;
 import org.dromara.system.domain.bo.TeacherInfoBo;
@@ -35,7 +36,7 @@ public interface ITeacherInfoService {
     /**
      * 新增老师档案信息
      */
-    Boolean insertByBo(TeacherInfoBo bo);
+    R<Void> insertByBo(TeacherInfoBo bo);
 
     /**
      * 修改老师档案信息

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

@@ -1,5 +1,6 @@
 package org.dromara.system.service.impl;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import lombok.SneakyThrows;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.ClassUtils;
@@ -57,6 +58,7 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
      * 查询注册-家长列表
      */
     @Override
+    @InterceptorIgnore(tenantLine = "true")
     public TableDataInfo<RegisterParentsVo> queryPageList(RegisterParentsBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<RegisterParents> lqw = buildQueryWrapper(bo);
         Page<RegisterParentsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
@@ -112,6 +114,7 @@ public class RegisterParentsServiceImpl implements IRegisterParentsService {
         if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){
             for (RegisterParentsStudentVo registerParentsStudent : registerParentsStudentList) {
                 registerParentsStudent.setParentsId(bo.getId());
+                registerParentsStudent.setTenantId(bo.getTenantId());
                 registerParentsStudent.setParentsName(bo.getUserName());
                 registerParentsStudent.setParentsPhone(bo.getUserPhone());
                 registerParentsStudent.setCreateTime(DateUtils.getNowDate());

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

@@ -8,6 +8,7 @@ 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.system.domain.RegisterTeacher;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.RegisterTeacherClassBo;
 import org.dromara.system.domain.vo.RegisterTeacherClassVo;
@@ -61,6 +62,7 @@ public class RegisterTeacherClassServiceImpl implements IRegisterTeacherClassSer
     private LambdaQueryWrapper<RegisterTeacherClass> buildQueryWrapper(RegisterTeacherClassBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<RegisterTeacherClass> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), RegisterTeacherClass::getTenantId, bo.getTenantId());
         lqw.eq(bo.getTeacherId() != null, RegisterTeacherClass::getTeacherId, bo.getTeacherId());
         lqw.eq(bo.getClassId() != null, RegisterTeacherClass::getClassId, bo.getClassId());
         lqw.like(StringUtils.isNotBlank(bo.getClassName()), RegisterTeacherClass::getClassName, bo.getClassName());

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

@@ -1,18 +1,27 @@
 package org.dromara.system.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 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;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 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.mybatis.helper.DataPermissionHelper;
 import org.dromara.system.domain.RegisterTeacherClass;
+import org.dromara.system.domain.SysTenant;
 import org.dromara.system.domain.bo.RegisterSchoolFileBo;
 import org.dromara.system.domain.bo.RegisterTeacherClassBo;
 import org.dromara.system.domain.vo.RegisterTeacherClassVo;
@@ -26,6 +35,7 @@ import org.dromara.system.mapper.RegisterTeacherMapper;
 import org.dromara.system.service.IRegisterTeacherService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -62,7 +72,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
     }
 
     /**
-     * 查询注册-老师列表
+     * 查询注册-老师列表租户
      */
     @Override
     public TableDataInfo<RegisterTeacherVo> queryPageList(RegisterTeacherBo bo, PageQuery pageQuery) {
@@ -76,10 +86,20 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
                 teacher.setRegisterTeacherClassList(registerTeacherClassList);
             }
         }
-
         return TableDataInfo.build(result);
     }
 
+    /*private Page<RegisterTeacherVo> selectVoPage(IPage<RegisterTeacher> page, LambdaQueryWrapper<RegisterTeacher> lqw) {
+        List<RegisterTeacherVo> list = baseMapper.selectListZ(page, lqw);
+        IPage<RegisterTeacherVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        if (CollUtil.isEmpty(list)) {
+            return (Page<RegisterTeacherVo>) voPage;
+        }
+        voPage.setRecords(list);
+        return (Page<RegisterTeacherVo>) voPage;
+    }*/
+
+
     /**
      * 查询注册-老师列表
      */
@@ -92,6 +112,7 @@ public class RegisterTeacherServiceImpl implements IRegisterTeacherService {
     private LambdaQueryWrapper<RegisterTeacher> buildQueryWrapper(RegisterTeacherBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<RegisterTeacher> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), RegisterTeacher::getTenantId, bo.getTenantId());
         lqw.eq(StringUtils.isNotBlank(bo.getOpenId()), RegisterTeacher::getOpenId, bo.getOpenId());
         lqw.eq(bo.getSchoolId() != null, RegisterTeacher::getSchoolId, bo.getSchoolId());
         lqw.like(StringUtils.isNotBlank(bo.getSchoolName()), RegisterTeacher::getSchoolName, bo.getSchoolName());

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

@@ -1,5 +1,8 @@
 package org.dromara.system.service.impl;
 
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,6 +11,9 @@ 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.system.domain.bo.StudentLiveOldBo;
+import org.dromara.system.domain.vo.StudentLiveOldVo;
+import org.dromara.system.mapper.StudentLiveOldMapper;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.StudentInfoOldBo;
 import org.dromara.system.domain.vo.StudentInfoOldVo;
@@ -15,9 +21,7 @@ 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;
+import java.util.*;
 
 /**
  * 学生档案历史信息Service业务层处理
@@ -30,6 +34,7 @@ import java.util.Collection;
 public class StudentInfoOldServiceImpl implements IStudentInfoOldService {
 
     private final StudentInfoOldMapper baseMapper;
+    private final StudentLiveOldMapper studentLiveOldMapper;
 
     /**
      * 查询学生档案历史信息
@@ -44,8 +49,11 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService {
      */
     @Override
     public TableDataInfo<StudentInfoOldVo> queryPageList(StudentInfoOldBo bo, PageQuery pageQuery) {
+        if (bo.getStudentId() == null || bo.getStudentId() == 0L) {
+            throw new ServiceException("参数错误");
+        }
         LambdaQueryWrapper<StudentInfoOld> lqw = buildQueryWrapper(bo);
-        Page<StudentInfoOldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<StudentInfoOldVo> result = baseMapper.selectVoMapperPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -55,7 +63,7 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService {
     @Override
     public List<StudentInfoOldVo> queryList(StudentInfoOldBo bo) {
         LambdaQueryWrapper<StudentInfoOld> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectVoMapperList(lqw);
     }
 
     private LambdaQueryWrapper<StudentInfoOld> buildQueryWrapper(StudentInfoOldBo bo) {
@@ -139,4 +147,40 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public R<Map<String, Object>> selectStudentInfoOldListEcharts(StudentLiveOldBo bo) {
+        if (bo.getStudentId() == null || bo.getStudentId() == 0L) {
+            throw new ServiceException("参数错误");
+        }
+        List<StudentLiveOldVo> studentLiveOldList = studentLiveOldMapper.selectStudentLiveOldListEcharts(bo);
+
+        Map<String, Object> map = new HashMap<>();
+        List<Object> x = new ArrayList<>();
+        List<Object> y1 = new ArrayList<>();
+        List<Object> y2 = new ArrayList<>();
+        String sg = "0";
+        String tz = "0";
+
+        if (studentLiveOldList != null && studentLiveOldList.size() > 0) {
+            for (int i = 0; i < studentLiveOldList.size(); i++) {
+                StudentLiveOldVo liveOld = studentLiveOldList.get(i);
+                if(StringUtils.isEmpty(liveOld.getHeight()) || StringUtils.isEmpty(liveOld.getWeight())){
+                    continue;
+                }
+                if (!sg.equals(liveOld.getHeight()) || !tz.equals(liveOld.getWeight())) {
+                    sg = liveOld.getHeight();
+                    tz = liveOld.getWeight();
+                    x.add(DateUtils.dateTime(liveOld.getUpdateTime()));
+                    y1.add(liveOld.getHeight());
+                    y2.add(liveOld.getWeight());
+                }
+            }
+        }
+
+        map.put("X", x);
+        map.put("Y1", y1);
+        map.put("Y2", y2);
+        return R.ok("成功", map);
+    }
 }

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

@@ -1,6 +1,11 @@
 package org.dromara.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.SneakyThrows;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.LoginUser;
+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;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -10,13 +15,19 @@ 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.dromara.system.domain.*;
+import org.dromara.system.mapper.StudentInfoOldMapper;
+import org.dromara.system.mapper.StudentLiveOldMapper;
+import org.dromara.system.mapper.StudentMindOldMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 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 org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -32,13 +43,16 @@ import java.util.Collection;
 public class StudentInfoServiceImpl implements IStudentInfoService {
 
     private final StudentInfoMapper baseMapper;
+    private final StudentInfoOldMapper studentInfoOldMapper;
+    private final StudentLiveOldMapper studentLiveOldMapper;
+    private final StudentMindOldMapper studentMindOldMapper;
 
     /**
      * 查询学生档案信息
      */
     @Override
     public StudentInfoVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        return baseMapper.selectStudentInfoByStudentId(id);
     }
 
     /**
@@ -58,79 +72,114 @@ public class StudentInfoServiceImpl implements IStudentInfoService {
         }
         //return baseMapper.selectStudentInfoList(pageQuery,bo);
 
-        LambdaQueryWrapper<StudentInfo> lqw = buildQueryWrapper(bo);
-        Page<StudentInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<StudentInfo> lqw = buildQueryWrapper(bo);
+        Page<StudentInfoVo> result = baseMapper.selectStudentInfoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
+
+
     /**
      * 查询学生档案信息列表
      */
     @Override
     public List<StudentInfoVo> queryList(StudentInfoBo bo) {
-        LambdaQueryWrapper<StudentInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<StudentInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectStudentInfo(lqw);
     }
 
-    private LambdaQueryWrapper<StudentInfo> buildQueryWrapper(StudentInfoBo bo) {
+    private QueryWrapper<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());
+        QueryWrapper<StudentInfo> lqw = Wrappers.query();
+        lqw.eq(bo.getStudentId() != null, "s.student_id", bo.getStudentId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), "s.name", bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), "s.sex", bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), "s.age", bo.getAge());
+        lqw.like(StringUtils.isNotBlank(bo.getFamilyName()), "s.family_name", bo.getFamilyName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchool()), "s.school", bo.getSchool());
+        lqw.eq(StringUtils.isNotBlank(bo.getStudentNumber()), "s.student_number", bo.getStudentNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), "s.id_card", bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsNearsightedness()), "s.is_nearsightedness", bo.getIsNearsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getDegreeMyopia()), "s.degree_myopia", bo.getDegreeMyopia());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsFarsightedness()), "s.is_farsightedness", bo.getIsFarsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getFarsightedness()), "s.farsightedness", bo.getFarsightedness());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeight()), "s.height", bo.getHeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getWeight()), "s.weight", bo.getWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getBloodType()), "s.blood_type", bo.getBloodType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPoliticalStatus()), "s.political_status", bo.getPoliticalStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getHealth()), "s.health", bo.getHealth());
+        lqw.eq(StringUtils.isNotBlank(bo.getMind()), "s.mind", bo.getMind());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), "s.emergency_contact", bo.getEmergencyContact());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactTelephone()), "s.emergency_contact_telephone", bo.getEmergencyContactTelephone());
+        lqw.like(StringUtils.isNotBlank(bo.getFatherName()), "s.father_name", bo.getFatherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getFatherTelephone()), "s.father_telephone", bo.getFatherTelephone());
+        lqw.like(StringUtils.isNotBlank(bo.getMotherName()), "s.mother_name", bo.getMotherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getMotherTelephone()), "s.mother_telephone", bo.getMotherTelephone());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddress()), "s.address", bo.getAddress());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsMedicalHistory()), "s.is_medical_history", bo.getIsMedicalHistory());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsLset()), "s.is_lset", bo.getIsLset());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsPoverty()), "s.is_poverty", bo.getIsPoverty());
+        lqw.eq(StringUtils.isNotBlank(bo.getClassId()), "f.class_id", bo.getClassId());
+        lqw.eq(StringUtils.isNotBlank(bo.getClassId()), "f.parents_id", bo.getParentsId());
+        lqw.orderByDesc("s.create_time");
         return lqw;
     }
 
     /**
      * 新增学生档案信息
      */
+    @SneakyThrows
     @Override
-    public Boolean insertByBo(StudentInfoBo bo) {
+    @Transactional(rollbackFor = Exception.class)
+    public R<Void> insertByBo(StudentInfoBo bo) {
+        //查询数据库是否存在信息
+        StudentInfoBo student = new StudentInfoBo();
+        student.setStudentId(bo.getStudentId());
+        QueryWrapper<StudentInfo> lqw = buildQueryWrapper(student);
+        List<StudentInfoVo> studentInfos = baseMapper.selectStudentInfo(lqw);
+        if(studentInfos!=null && studentInfos.size()>0){
+            return R.fail("该学生已存在，请勿重复添加");
+        }
+
+        //新增 心理健康
+        StudentMindOld studentMindOld = new StudentMindOld();
+        ClassUtils.copyProperties(student, studentMindOld);
+        studentMindOld.setCreateTime(DateUtils.getNowDate());
+        studentMindOld.setUpdateTime(DateUtils.getNowDate());
+        studentMindOldMapper.insert(studentMindOld);
+
+        //新增 身高体重
+        StudentLiveOld studentLiveOld = new StudentLiveOld();
+        ClassUtils.copyProperties(student, studentLiveOld);
+        studentLiveOld.setCreateTime(DateUtils.getNowDate());
+        studentLiveOld.setUpdateTime(DateUtils.getNowDate());
+        studentLiveOldMapper.insert(studentLiveOld);
+
         StudentInfo add = MapstructUtils.convert(bo, StudentInfo.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+            return R.ok();
         }
-        return flag;
+        return R.fail();
     }
 
     /**
      * 修改学生档案信息
      */
+    @SneakyThrows
     @Override
     public Boolean updateByBo(StudentInfoBo bo) {
+        //查询修改前数据
+        StudentInfoVo student = baseMapper.selectStudentInfoByStudentId(bo.getStudentId());
+        StudentInfoOld studentInfoOld = new StudentInfoOld();
+        ClassUtils.copyProperties(student, studentInfoOld);
+        studentInfoOld.setCreateTime(DateUtils.getNowDate());
+        studentInfoOld.setUpdateTime(bo.getCreateTime());
+        studentInfoOldMapper.insert(studentInfoOld);
+        bo.setId(student.getId());
+        bo.setUpdateTime(DateUtils.getNowDate());
         StudentInfo update = MapstructUtils.convert(bo, StudentInfo.class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
@@ -153,4 +202,48 @@ public class StudentInfoServiceImpl implements IStudentInfoService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public R<Map<String, Object>> statistics(StudentInfoBo bo) {
+        if(StringUtils.isEmpty(bo.getClassId())){
+            return R.fail("请选择班级");
+        }
+        int zs = 0;
+        int nan = 0;
+        int nv = 0;
+        int js = 0;
+        int ls = 0;
+        int pk = 0;
+        Map<String,Object> map = new HashMap<>();
+        QueryWrapper<StudentInfo> lqw = buildQueryWrapper(bo);
+        List<StudentInfoVo> studentInfoList = baseMapper.selectStudentInfo(lqw);
+        if(studentInfoList!=null && studentInfoList.size()>0){
+            for (StudentInfoVo info : studentInfoList) {
+                zs++;
+                if(StringUtils.isNotEmpty(info.getSex()) && info.getSex().equals("1")){
+                    nan++;
+                }else{
+                    nv++;
+                }
+
+                if(StringUtils.isNotEmpty(info.getIsNearsightedness()) && info.getIsNearsightedness().equals("1")){
+                    js++;
+                }
+                if(StringUtils.isNotEmpty(info.getIsLset()) && info.getIsLset().equals("1")){
+                    ls++;
+                }
+                if(StringUtils.isNotEmpty(info.getIsPoverty()) && info.getIsPoverty().equals("1")){
+                    pk++;
+                }
+            }
+        }
+        map.put("zs",zs);
+        map.put("nan",nan);
+        map.put("nv",nv);
+        map.put("js",js);
+        map.put("ls",ls);
+        map.put("pk",pk);
+
+        return R.ok("成功",map);
+    }
 }

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

@@ -1,5 +1,10 @@
 package org.dromara.system.service.impl;
 
+import lombok.SneakyThrows;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+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;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,12 +13,17 @@ 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.dromara.system.domain.StudentInfo;
+import org.dromara.system.domain.vo.StudentInfoVo;
+import org.dromara.system.mapper.StudentInfoMapper;
 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 org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -30,13 +40,14 @@ import java.util.Collection;
 public class StudentLiveOldServiceImpl implements IStudentLiveOldService {
 
     private final StudentLiveOldMapper baseMapper;
+    private final StudentInfoMapper studentInfoMapper;
 
     /**
      * 查询学生生活历史信息
      */
     @Override
     public StudentLiveOldVo queryById(Long liveId){
-        return baseMapper.selectVoById(liveId);
+        return baseMapper.selectVoMapperById(liveId);
     }
 
     /**
@@ -45,7 +56,7 @@ public class StudentLiveOldServiceImpl implements IStudentLiveOldService {
     @Override
     public TableDataInfo<StudentLiveOldVo> queryPageList(StudentLiveOldBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<StudentLiveOld> lqw = buildQueryWrapper(bo);
-        Page<StudentLiveOldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<StudentLiveOldVo> result = baseMapper.selectVoMapperPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -55,13 +66,14 @@ public class StudentLiveOldServiceImpl implements IStudentLiveOldService {
     @Override
     public List<StudentLiveOldVo> queryList(StudentLiveOldBo bo) {
         LambdaQueryWrapper<StudentLiveOld> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectVoMapperList(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.getCreateByName()), StudentLiveOld::getCreateByName, bo.getCreateByName());
         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());
@@ -77,8 +89,26 @@ public class StudentLiveOldServiceImpl implements IStudentLiveOldService {
     /**
      * 新增学生生活历史信息
      */
+    @SneakyThrows
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(StudentLiveOldBo bo) {
+        LoginUser user = LoginHelper.getLoginUser();
+        StudentInfoVo student = studentInfoMapper.selectStudentInfoByStudentId(bo.getStudentId());
+        if(student==null){
+            throw new ServiceException("请先填写学生档案信息");
+        }
+        student.setHeight(bo.getHeight());
+        student.setWeight(bo.getWeight());
+        student.setUpdateTime(DateUtils.getNowDate());
+        StudentInfo studentInfo = new StudentInfo();
+        ClassUtils.copyProperties(student, studentInfo);
+        studentInfoMapper.updateById(studentInfo);
+
+        ClassUtils.copyProperties(student, bo);
+        bo.setCreateTime(DateUtils.getNowDate());
+        bo.setUpdateTime(DateUtils.getNowDate());
+        bo.setCreateByName(user.getUsername());
         StudentLiveOld add = MapstructUtils.convert(bo, StudentLiveOld.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;

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

@@ -1,5 +1,10 @@
 package org.dromara.system.service.impl;
 
+import lombok.SneakyThrows;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+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;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,12 +13,17 @@ 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.dromara.system.domain.StudentInfo;
+import org.dromara.system.domain.vo.StudentInfoVo;
+import org.dromara.system.mapper.StudentInfoMapper;
 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 org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -30,13 +40,14 @@ import java.util.Collection;
 public class StudentMindOldServiceImpl implements IStudentMindOldService {
 
     private final StudentMindOldMapper baseMapper;
+    private final StudentInfoMapper studentInfoMapper;
 
     /**
      * 查询学生心理健康历史信息
      */
     @Override
     public StudentMindOldVo queryById(Long mindId){
-        return baseMapper.selectVoById(mindId);
+        return baseMapper.selectVoMapperById(mindId);
     }
 
     /**
@@ -45,7 +56,7 @@ public class StudentMindOldServiceImpl implements IStudentMindOldService {
     @Override
     public TableDataInfo<StudentMindOldVo> queryPageList(StudentMindOldBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<StudentMindOld> lqw = buildQueryWrapper(bo);
-        Page<StudentMindOldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<StudentMindOldVo> result = baseMapper.selectVoMapperPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -55,13 +66,14 @@ public class StudentMindOldServiceImpl implements IStudentMindOldService {
     @Override
     public List<StudentMindOldVo> queryList(StudentMindOldBo bo) {
         LambdaQueryWrapper<StudentMindOld> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectVoMaooerList(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.getCreateByName()), StudentMindOld::getCreateByName, bo.getCreateByName());
         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());
@@ -77,8 +89,28 @@ public class StudentMindOldServiceImpl implements IStudentMindOldService {
     /**
      * 新增学生心理健康历史信息
      */
+    @SneakyThrows
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(StudentMindOldBo bo) {
+
+        LoginUser user = LoginHelper.getLoginUser();
+        StudentInfoVo student = studentInfoMapper.selectStudentInfoByStudentId(bo.getStudentId());
+        if(student==null){
+            throw new ServiceException("请先填写学生档案信息");
+        }
+        student.setMind(bo.getMind());
+        student.setPsychologicalDescription(bo.getPsychologicalDescription());
+        student.setUpdateTime(DateUtils.getNowDate());
+        StudentInfo studentInfo = new StudentInfo();
+        ClassUtils.copyProperties(student, studentInfo);
+        studentInfoMapper.updateById(studentInfo);
+
+        ClassUtils.copyProperties(student, bo);
+        bo.setCreateTime(DateUtils.getNowDate());
+        bo.setUpdateTime(DateUtils.getNowDate());
+        bo.setCreateByName(user.getUsername());
+
         StudentMindOld add = MapstructUtils.convert(bo, StudentMindOld.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;

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

@@ -1,5 +1,7 @@
 package org.dromara.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,6 +10,7 @@ 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.system.domain.StudentInfo;
 import org.springframework.stereotype.Service;
 import org.dromara.system.domain.bo.TeacherInfoBo;
 import org.dromara.system.domain.vo.TeacherInfoVo;
@@ -36,7 +39,7 @@ public class TeacherInfoServiceImpl implements ITeacherInfoService {
      */
     @Override
     public TeacherInfoVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        return baseMapper.selectVoMapperById(id);
     }
 
     /**
@@ -44,8 +47,8 @@ public class TeacherInfoServiceImpl implements ITeacherInfoService {
      */
     @Override
     public TableDataInfo<TeacherInfoVo> queryPageList(TeacherInfoBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<TeacherInfo> lqw = buildQueryWrapper(bo);
-        Page<TeacherInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<TeacherInfo> lqw = buildQueryWrapper(bo);
+        Page<TeacherInfoVo> result = baseMapper.selectVoMapperPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -54,33 +57,28 @@ public class TeacherInfoServiceImpl implements ITeacherInfoService {
      */
     @Override
     public List<TeacherInfoVo> queryList(TeacherInfoBo bo) {
-        LambdaQueryWrapper<TeacherInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        QueryWrapper<TeacherInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoMapperList(lqw);
     }
 
-    private LambdaQueryWrapper<TeacherInfo> buildQueryWrapper(TeacherInfoBo bo) {
+    private QueryWrapper<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());
+        QueryWrapper<TeacherInfo> lqw = Wrappers.query();
+        lqw.eq(bo.getTeacherId() != null && bo.getSchoolId() !=0L, "t.teacher_id", bo.getTeacherId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), "t.name", bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), "t.sex", bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getAge()), "t.age", bo.getAge());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), "t.phone", bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getProfessional()), "t.professional", bo.getProfessional());
+        lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), "t.id_card", bo.getIdCard());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeight()), "t.height", bo.getHeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getWeight()), "t.weight", bo.getWeight());
+        lqw.eq(StringUtils.isNotBlank(bo.getBloodType()), "t.blood_type", bo.getBloodType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPoliticalStatus()), "t.political_status", bo.getPoliticalStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddress()), "t.address", bo.getAddress());
+        lqw.eq(bo.getOnBoardTime() != null && bo.getSchoolId() !=0L, "t.on_board_time", bo.getOnBoardTime());
+        lqw.eq(bo.getJobTime() != null && bo.getSchoolId() !=0L, "t.job_time", bo.getJobTime());
+        lqw.eq(bo.getSchoolId() != null && bo.getSchoolId() !=0L, "f.school_id", bo.getJobTime());
         return lqw;
     }
 
@@ -88,14 +86,24 @@ public class TeacherInfoServiceImpl implements ITeacherInfoService {
      * 新增老师档案信息
      */
     @Override
-    public Boolean insertByBo(TeacherInfoBo bo) {
+    public R<Void> insertByBo(TeacherInfoBo bo) {
+
+        //查询数据库是否存在信息
+        TeacherInfoBo teacher = new TeacherInfoBo();
+        teacher.setTeacherId(bo.getTeacherId());
+        QueryWrapper<TeacherInfo> lqw = buildQueryWrapper(teacher);
+        List<TeacherInfoVo> teacherInfos = baseMapper.selectVoMapperList(lqw);
+        if(teacherInfos!=null && teacherInfos.size()>0){
+            return R.fail("老师信息已录入，请勿重复录入");
+        }
         TeacherInfo add = MapstructUtils.convert(bo, TeacherInfo.class);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+            return R.ok();
         }
-        return flag;
+        return R.fail();
     }
 
     /**

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

@@ -70,6 +70,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
     private final SysDictTypeMapper dictTypeMapper;
     private final SysDictDataMapper dictDataMapper;
     private final SysConfigMapper configMapper;
+    private final SysRoleMapper sysRoleMapper;
 
     /**
      * 查询智慧校园_审核意见
@@ -143,7 +144,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 registerSchoolMapper.updateById(schoolu);
                 //生成租户信息
                 SysTenantBo tenantBo = new SysTenantBo();
-                tenantBo.setCompanyName(registerSchool.getUserName());
+                tenantBo.setCompanyName(registerSchool.getSchoolName());
                 tenantBo.setContactUserName(registerSchool.getUserName());
                 tenantBo.setContactPhone(registerSchool.getUserPhone());
                 tenantBo.setUsername(registerSchool.getUserPhone());
@@ -162,6 +163,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 tenantBo.setId(sysTenant.getId());
 
                 copyDict(tenantId);
+                copyRole(tenantId);
                 //部门表生成学校
                 SysDept dept = new SysDept();
                 dept.setParentId(0L);
@@ -172,6 +174,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 dept.setOrderNum(sysDept.getOrderNum()+1);
                 dept.setPhone(registerSchool.getUserPhone());
                 dept.setCreateTime(DateUtils.getNowDate());
+                dept.setTenantId(tenantId);
                 sysDeptMapper.insert(dept);
                 //判断是否存在账号
                 SysUserVo use = userMapper.selectUserByUserName(registerSchool.getUserPhone());
@@ -191,11 +194,14 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     use.setUserId(sysUser.getUserId());
                 }else{
                     use.setDeptId(dept.getDeptId());
+                    use.setTenantId(sysTenant.getTenantId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
                     userMapper.insert(sysUser);
                 }
                 //新增用户与角色管理
-                Long[] roleIds = {4L};
+                //查询当前租户下的学校角色
+                Long roleId = sysRoleMapper.selectRoleIdBytenantId(tenantId,"school");
+                Long[] roleIds = {roleId};
                 sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds,false);
             }else{
                 //不通过  修改注册表审核结果
@@ -229,7 +235,10 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                 //生成账号
                 //判断是否存在账号
                 SysUserVo use = userMapper.selectUserByUserName(registerTeacher.getUserPhone());
+                //查询dept数据
+                SysDeptVo sysDept = sysDeptMapper.selectDeptByIdNoTenantId(registerTeacher.getSchoolId());
                 if(use==null){
+
                     use = new SysUserVo();
                     use.setOpenId(registerTeacher.getOpenId());
                     use.setDeptId(registerTeacher.getSchoolId());
@@ -238,17 +247,20 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
                     use.setPhonenumber(registerTeacher.getUserPhone());
                     use.setPassword(BCrypt.hashpw("1qaz!QAZ"));
                     use.setCreateTime(DateUtils.getNowDate());
+                    use.setTenantId(sysDept.getTenantId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
                     userMapper.insert(sysUser);
                     use.setUserId(sysUser.getUserId());
                 }else{
                     use.setDeptId(registerTeacher.getSchoolId());
+                    use.setTenantId(sysDept.getTenantId());
                     SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
                     userMapper.insert(sysUser);
                 }
 
                 //新增用户与角色管理
-                Long[] roleIds = {3L};
+                Long roleId = sysRoleMapper.selectRoleIdBytenantId(sysDept.getTenantId(),"school");
+                Long[] roleIds = {roleId};
                 sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds,false);
                 //老师-班级（学科）数据
                 for (RegisterTeacherClassVo teacherClass : registerTeacherClassList) {
@@ -383,6 +395,16 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService {
         return flag;
     }
 
+    private void copyRole(String tenantId) {
+        String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
+        List<SysRole> roleList = sysRoleMapper.selectList(
+            new LambdaQueryWrapper<SysRole>().eq(SysRole::getTenantId, defaultTenantId));
+        for (SysRole sysRole : roleList) {
+            sysRole.setTenantId(tenantId);
+        }
+        sysRoleMapper.insertBatch(roleList);
+    }
+
     /***
      *复制公用字典值
      * @param tenantId

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

@@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="oneStartTime"    column="one_start_time"    />
         <result property="oneEndTime"    column="one_end_time"    />
         <result property="twoStartTime"    column="two_start_time"    />
-        <result property="twoEndTime"    column="two__end_time"    />
+        <result property="twoEndTime"    column="two_end_time"    />
         <result property="threeStartTime"    column="three_start_time"    />
         <result property="threeEndTime"    column="three_end_time"    />
         <result property="fourStartTime"    column="four_start_time"    />
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCourseTableTimeVo">
-        select id, school_id, school_name, one_start_time, one_end_time, two_start_time, two__end_time, three_start_time, three_end_time, four_start_time, four_end_time, five_start_time, five_end_time, six_start_time, six_end_time, seven_start_time, seven_end_time, eight_start_time, eight_end_time, create_by, create_time, update_by, update_time, remark from course_table_time
+        select id, school_id, school_name, one_start_time, one_end_time, two_start_time, two_end_time, three_start_time, three_end_time, four_start_time, four_end_time, five_start_time, five_end_time, six_start_time, six_end_time, seven_start_time, seven_end_time, eight_start_time, eight_end_time, create_by, create_time, update_by, update_time, remark from course_table_time
     </sql>
 
     <select id="selectCourseTableTimeBySchoolId" resultMap="CourseTableTimeResult">

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

@@ -30,6 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where  open_id = #{openId} limit 1
     </select>
 
+    <select id="selectListZ" resultMap="RegisterTeacherResult">
+        <include refid="selectRegisterTeacherVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+
     <select id="selectRegisterTeacherByPhonenumber" resultMap="RegisterTeacherResult">
         <include refid="selectRegisterTeacherVo"/>
         where  user_phone = #{phonenumber} limit 1
@@ -40,4 +45,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where date_format(create_time,'%Y%m') = date_format(#{monthFirst},'%Y%m')
         and school_id = #{deptId}
     </select>
+
 </mapper>

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

@@ -4,4 +4,89 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.StudentInfoMapper">
 
+    <resultMap type="org.dromara.system.domain.vo.StudentInfoVo" id="StudentInfoResult">
+        <result property="id"    column="id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="school"    column="school"    />
+        <result property="studentNumber"    column="student_number"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="height"    column="height"    />
+        <result property="weight"    column="weight"    />
+        <result property="bloodType"    column="blood_type"    />
+        <result property="politicalStatus"    column="political_status"    />
+        <result property="identificationPhoto"    column="identification_photo"    />
+        <result property="entrancePermit"    column="entrance_permit"    />
+        <result property="fatherName"    column="father_name"    />
+        <result property="fatherTelephone"    column="father_telephone"    />
+        <result property="motherName"    column="mother_name"    />
+        <result property="motherTelephone"    column="mother_telephone"    />
+        <result property="address"    column="address"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+
+        <result property="isNearsightedness"    column="is_nearsightedness"    />
+        <result property="degreeMyopia"    column="degree_myopia"    />
+        <result property="health"    column="health"    />
+        <result property="mind"    column="mind"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+
+        <result property="isMedicalHistory"    column="is_medical_history"    />
+        <result property="medicalDescription"    column="medical_description"    />
+        <result property="psychologicalDescription"    column="psychological_description"    />
+
+
+        <result property="isLset"    column="is_lset"    />
+        <result property="isPoverty"    column="is_poverty"    />
+
+        <result property="emergencyContact"    column="emergency_contact"    />
+        <result property="emergencyContactTelephone"    column="emergency_contact_telephone"    />
+
+        <result property="familyName"    column="family_name"    />
+        <result property="isFarsightedness"    column="is_farsightedness"    />
+        <result property="farsightedness"    column="farsightedness"    />
+
+
+       <!-- <result property="classId"    column="classId"    />
+        <result property="parentsId"    column="parentsId"    />-->
+
+    </resultMap>
+
+    <sql id="selectStudentInfoVo">
+        select id, student_id, name, sex, age, school, student_number, id_card, height, weight, blood_type, political_status, identification_photo,
+               entrance_permit, father_name, father_telephone, mother_name, mother_telephone, address, create_by, create_time, update_by, update_time,
+               remark,is_nearsightedness,degree_myopia,health,mind,longitude,latitude,is_medical_history,medical_description,psychological_description,
+               is_lset,is_poverty,emergency_contact,emergency_contact_telephone,family_name,is_farsightedness,farsightedness from student_info
+    </sql>
+
+    <select id="selectStudentInfoPage" resultMap="StudentInfoResult">
+        select s.id, s.student_id, s.name, s.sex, s.age, s.school, s.student_number, s.id_card, s.height, s.weight, s.blood_type, s.political_status, s.identification_photo,
+               s.entrance_permit, s.father_name, s.father_telephone, s.mother_name, s.mother_telephone, s.address, s.create_by, s.create_time, s.update_by, s.update_time, s.remark,
+               s.is_nearsightedness,s.degree_myopia,s.health,mind,s.longitude,s.latitude,s.is_medical_history,s.medical_description,s.psychological_description, s.is_lset,s.is_poverty,
+               s.emergency_contact,s.emergency_contact_telephone,s.family_name,s.is_farsightedness,s.farsightedness
+        from student_info s
+        left join formal_parents_student f on s.student_id = f.id
+        ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectStudentInfoByStudentId" resultMap="StudentInfoResult">
+        <include refid="selectStudentInfoVo"/>
+        where student_id = #{studentId}
+    </select>
+    <select id="selectStudentInfo" resultMap="StudentInfoResult">
+        select s.id, s.student_id, s.name, s.sex, s.age, s.school, s.student_number, s.id_card, s.height, s.weight, s.blood_type, s.political_status, s.identification_photo,
+               s.entrance_permit, s.father_name, s.father_telephone, s.mother_name, s.mother_telephone, s.address, s.create_by, s.create_time, s.update_by, s.update_time, s.remark,
+               s.is_nearsightedness,s.degree_myopia,s.health,mind,s.longitude,s.latitude,s.is_medical_history,s.medical_description,s.psychological_description, s.is_lset,s.is_poverty,
+               s.emergency_contact,s.emergency_contact_telephone,s.family_name,s.is_farsightedness,s.farsightedness
+        from student_info s
+        left join formal_parents_student f on s.student_id = f.id
+        ${ew.getCustomSqlSegment}
+    </select>
+
+
 </mapper>

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

@@ -4,4 +4,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.StudentInfoOldMapper">
 
+    <resultMap type="org.dromara.system.domain.vo.StudentInfoOldVo" id="StudentInfoOldResult">
+        <result property="oldId"    column="old_id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="school"    column="school"    />
+        <result property="studentNumber"    column="student_number"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="isNearsightedness"    column="is_nearsightedness"    />
+        <result property="degreeMyopia"    column="degree_myopia"    />
+        <result property="height"    column="height"    />
+        <result property="weight"    column="weight"    />
+        <result property="bloodType"    column="blood_type"    />
+        <result property="politicalStatus"    column="political_status"    />
+        <result property="health"    column="health"    />
+        <result property="identificationPhoto"    column="identification_photo"    />
+        <result property="mind"    column="mind"    />
+        <result property="entrancePermit"    column="entrance_permit"    />
+        <result property="fatherName"    column="father_name"    />
+        <result property="fatherTelephone"    column="father_telephone"    />
+        <result property="motherName"    column="mother_name"    />
+        <result property="motherTelephone"    column="mother_telephone"    />
+        <result property="address"    column="address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="remark"    column="remark"    />
+
+        <result property="isMedicalHistory"    column="is_medical_history"    />
+        <result property="medicalDescription"    column="medical_description"    />
+        <result property="psychologicalDescription"    column="psychological_description"    />
+
+        <result property="isLset"    column="is_lset"    />
+        <result property="isPoverty"    column="is_poverty"    />
+
+        <result property="emergencyContact"    column="emergency_contact"    />
+        <result property="emergencyContactTelephone"    column="emergency_contact_telephone"    />
+
+        <result property="familyName"    column="family_name"    />
+        <result property="isFarsightedness"    column="is_farsightedness"    />
+        <result property="farsightedness"    column="farsightedness"    />
+    </resultMap>
+
+    <sql id="selectStudentInfoOldVo">
+        select old_id, student_id, name, sex, age, school, student_number, id_card, is_nearsightedness, degree_myopia, height, weight, blood_type, political_status,
+               health, identification_photo, mind, entrance_permit, father_name, father_telephone, mother_name, mother_telephone, address, longitude, latitude,
+               create_by, create_time, update_by, update_time, remark,is_medical_history,medical_description,psychological_description,is_lset,is_poverty,
+               emergency_contact,emergency_contact_telephone,family_name,is_farsightedness,farsightedness from student_info_old
+    </sql>
+
+    <select id="selectVoMapperPage" resultMap="StudentInfoOldResult">
+        <include refid="selectStudentInfoOldVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectVoMapperList" resultMap="StudentInfoOldResult">
+        <include refid="selectStudentInfoOldVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
 </mapper>

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

@@ -4,4 +4,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.StudentLiveOldMapper">
 
+    <resultMap type="org.dromara.system.domain.vo.StudentLiveOldVo" id="StudentLiveOldResult">
+        <result property="liveId"    column="live_id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="school"    column="school"    />
+        <result property="studentNumber"    column="student_number"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="height"    column="height"    />
+        <result property="weight"    column="weight"    />
+        <result property="createType"    column="create_type"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectStudentLiveOldVo">
+        select live_id, student_id, name, sex, age, school, student_number, id_card, height, weight,create_type, create_by, create_time, update_by, update_time, remark from student_live_old
+    </sql>
+
+    <select id="selectStudentLiveOldListEcharts" resultMap="StudentLiveOldResult">
+        <include refid="selectStudentLiveOldVo"/>
+        <where>
+            <if test="studentId != null "> and student_id = #{studentId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+            <if test="age != null  and age != ''"> and age = #{age}</if>
+            <if test="school != null  and school != ''"> and school = #{school}</if>
+            <if test="studentNumber != null  and studentNumber != ''"> and student_number = #{studentNumber}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="height != null  and height != ''"> and height = #{height}</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+            <if test="createType != null and createType != ''"> and create_type = #{createType}</if>
+        </where>
+        order by create_time asc
+    </select>
+    <select id="selectVoMapperPage" resultMap="StudentLiveOldResult">
+        <include refid="selectStudentLiveOldVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectVoMapperList" resultMap="StudentLiveOldResult">
+        <include refid="selectStudentLiveOldVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectVoMapperById" resultMap="StudentLiveOldResult">
+        <include refid="selectStudentLiveOldVo"/>
+        where live_id = #{liveId}
+    </select>
 </mapper>

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

@@ -3,5 +3,40 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.StudentMindOldMapper">
+    <resultMap type="org.dromara.system.domain.vo.StudentMindOldVo" id="StudentMindOldResult">
+        <result property="mindId"    column="mind_id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="school"    column="school"    />
+        <result property="studentNumber"    column="student_number"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="mind"    column="mind"    />
+        <result property="psychologicalDescription"    column="psychological_description"    />
 
+        <result property="createType"    column="create_type"    />
+
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectStudentMindOldVo">
+        select mind_id, student_id, name, sex, age, school, student_number, id_card, mind, psychological_description,create_type, create_by, create_time, update_by, update_time, remark from student_mind_old
+    </sql>
+    <select id="selectVoMapperPage" resultMap="StudentMindOldResult">
+        <include refid="selectStudentMindOldVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectVoMapperById" resultMap="StudentMindOldResult">
+        <include refid="selectStudentMindOldVo"/>
+        where mind_id = #{mindId}
+    </select>
+    <select id="selectVoMaooerList" resultMap="StudentMindOldResult">
+        <include refid="selectStudentMindOldVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
 </mapper>

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

@@ -78,6 +78,10 @@
         order by d.parent_id, d.order_num
     </select>
 
+    <select id="selectDeptByIdNoTenantId" resultMap="SysDeptResult">
+        select * from sys_dept where del_flag = '0' and dept_id = #{deptId}
+    </select>
+
     <insert id="insertDeptList">
         insert into sys_dept(parent_id,dept_name,ancestors,order_num,status,create_time) values
         <foreach item="item" index="index" collection="list" separator=",">

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

@@ -81,5 +81,13 @@
                  left join sys_role_menu rm on m.menu_id = rm.menu_id
         where m.status = '0' and rm.role_id = #{roleId}
     </select>
+    <select id="getMenuListByRoleId" parameterType="Long" resultType="String">
+        select m.perms
+        from sys_menu m
+        left join sys_role_menu rm on m.menu_id = rm.menu_id
+        where rm.role_id = #{roleId}
+        and m.perms is not null and m.perms != ''
+        order by m.parent_id, m.order_num
+    </select>
 
 </mapper>

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

@@ -63,5 +63,8 @@
         <include refid="selectRoleVo"/>
         WHERE r.del_flag = '0' and r.role_id = #{roleId}
     </select>
+    <select id="selectRoleIdBytenantId" resultType="java.lang.Long">
+        select role_id where tenant_id = #{tenantId} and del_flag = 0 and role_key = #{roleKey}
+    </select>
 
 </mapper>

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

@@ -3,5 +3,73 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.TeacherInfoMapper">
+    <resultMap type="org.dromara.system.domain.vo.TeacherInfoVo" id="TeacherInfoResult">
+        <result property="id"    column="id"    />
+        <result property="teacherId"    column="teacher_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="phone"    column="phone"    />
+        <result property="professional"    column="professional"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="height"    column="height"    />
+        <result property="weight"    column="weight"    />
+        <result property="bloodType"    column="blood_type"    />
+        <result property="politicalStatus"    column="political_status"    />
+        <result property="graduationPhoto"    column="graduation_photo"    />
+        <result property="degreePhoto"    column="degree_photo"    />
+        <result property="teachingPhoto"    column="teaching_photo"    />
+        <result property="professionalPhoto"    column="professional_photo"    />
+        <result property="identificationPhoto"    column="identification_photo"    />
+        <result property="entrancePermit"    column="entrance_permit"    />
+        <result property="address"    column="address"    />
 
+        <result property="onBoardTime"    column="on_board_time"    />
+        <result property="jobTime"    column="job_time"    />
+
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+
+        <result property="schoolId"    column="schoolId"    />
+    </resultMap>
+
+    <sql id="selectTeacherInfoVo">
+        select id, teacher_id, name, sex, age, phone, professional, id_card, height, weight, blood_type, political_status, graduation_photo, degree_photo,
+               teaching_photo, professional_photo, identification_photo, entrance_permit, address,on_board_time,job_time, create_by, create_time,
+               update_by, update_time, remark from teacher_info
+    </sql>
+
+    <select id="selectVoMapperPage" resultMap="TeacherInfoResult">
+        select ANY_VALUE(t.id) as id, ANY_VALUE(t.teacher_id) as teacher_id,  ANY_VALUE(t.name) as name, ANY_VALUE(t.sex) as sex,
+               ANY_VALUE(t.age) as age, ANY_VALUE(t.phone) as phone, ANY_VALUE(t.professional) as professional, ANY_VALUE(t.id_card) as id_card,
+               ANY_VALUE(t.height) as height, ANY_VALUE(t.weight) as weight, ANY_VALUE(t.blood_type) as blood_type, ANY_VALUE(t.political_status) as political_status,
+               ANY_VALUE(t.graduation_photo) as graduation_photo, ANY_VALUE(t.degree_photo) as degree_photo,
+               ANY_VALUE(t.teaching_photo) as teaching_photo, ANY_VALUE(t.professional_photo) as professional_photo, ANY_VALUE(t.identification_photo) as identification_photo,
+               ANY_VALUE(t.entrance_permit) as entrance_permit, ANY_VALUE(t.address) as address,ANY_VALUE(t.on_board_time) as on_board_time,ANY_VALUE(t.job_time) as job_time,
+               ANY_VALUE(t.create_by) as create_by, ANY_VALUE(t.create_time) as create_time,
+               ANY_VALUE(t.update_by) as update_by, ANY_VALUE(t.update_time) as update_time, ANY_VALUE(t.remark) as remark
+        from teacher_info t
+                 left join formal_teacher_class f on t.teacher_id = f.teacher_id
+            ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectVoMapperList" resultMap="TeacherInfoResult">
+        select ANY_VALUE(t.id) as id, ANY_VALUE(t.teacher_id) as teacher_id,  ANY_VALUE(t.name) as name, ANY_VALUE(t.sex) as sex,
+               ANY_VALUE(t.age) as age, ANY_VALUE(t.phone) as phone, ANY_VALUE(t.professional) as professional, ANY_VALUE(t.id_card) as id_card,
+               ANY_VALUE(t.height) as height, ANY_VALUE(t.weight) as weight, ANY_VALUE(t.blood_type) as blood_type, ANY_VALUE(t.political_status) as political_status,
+               ANY_VALUE(t.graduation_photo) as graduation_photo, ANY_VALUE(t.degree_photo) as degree_photo,
+               ANY_VALUE(t.teaching_photo) as teaching_photo, ANY_VALUE(t.professional_photo) as professional_photo, ANY_VALUE(t.identification_photo) as identification_photo,
+               ANY_VALUE(t.entrance_permit) as entrance_permit, ANY_VALUE(t.address) as address,ANY_VALUE(t.on_board_time) as on_board_time,ANY_VALUE(t.job_time) as job_time,
+               ANY_VALUE(t.create_by) as create_by, ANY_VALUE(t.create_time) as create_time,
+               ANY_VALUE(t.update_by) as update_by, ANY_VALUE(t.update_time) as update_time, ANY_VALUE(t.remark) as remark
+        from teacher_info t
+                 left join formal_teacher_class f on t.teacher_id = f.teacher_id
+            ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectVoMapperById" resultMap="TeacherInfoResult">
+        <include refid="selectTeacherInfoVo"/>
+        where id = #{id}
+    </select>
 </mapper>