Merge remote-tracking branch 'origin/master'

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

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

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

@@ -35,7 +35,7 @@ public class FormalTeacherClass extends BaseEntity {
     /**
      * 学校id
      */
-    private String schoolId;
+    private Long schoolId;
 
     /**
      * 学校名称

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

@@ -27,6 +27,10 @@ public class SysUser extends TenantEntity {
     @TableId(value = "user_id")
     private Long userId;
 
+
+    /** 微信openid，微信唯一编码 */
+    private String openId;
+
     /**
      * 部门ID
      */

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

@@ -0,0 +1,78 @@
+package org.dromara.system.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 智慧校园_审核意见对象 zhxy_shyj
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("zhxy_shyj")
+public class ZhxyShyj extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 老师id
+     */
+    private Long teacherId;
+
+    /**
+     * 数据ID
+     */
+    private Long dataId;
+
+    /**
+     * 审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
+     */
+    private String type;
+
+    /**
+     * 审核人id
+     */
+    private Long auditId;
+
+    /**
+     * 审核人名称
+     */
+    private String auditUser;
+
+    /**
+     * 审核结果（是否通过  1：待审核，2：通过 3:不通过)
+     */
+    private String shjg;
+
+    /**
+     * 审核意见
+     */
+    private String shyj;
+
+    /**
+     * 审核时间
+     */
+    private Date shsj;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -29,6 +29,9 @@ public class SysUserBo extends BaseEntity {
      */
     private Long userId;
 
+    /** 微信openid，微信唯一编码 */
+    private String openId;
+
     /**
      * 部门ID
      */

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

@@ -0,0 +1,86 @@
+package org.dromara.system.domain.bo;
+
+import org.dromara.system.domain.ZhxyShyj;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 智慧校园_审核意见业务对象 zhxy_shyj
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ZhxyShyj.class, reverseConvertGenerate = false)
+public class ZhxyShyjBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 老师id
+     */
+    @NotNull(message = "老师id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long teacherId;
+
+    /**
+     * 数据ID
+     */
+    @NotNull(message = "数据ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long dataId;
+
+    /**
+     * 审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
+     */
+    @NotBlank(message = "审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 审核人id
+     */
+    @NotNull(message = "审核人id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long auditId;
+
+    /**
+     * 审核人名称
+     */
+    @NotBlank(message = "审核人名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String auditUser;
+
+    /**
+     * 审核结果（是否通过  1：待审核，2：通过 3:不通过)
+     */
+    @NotBlank(message = "审核结果（是否通过  1：待审核，2：通过 3:不通过)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String shjg;
+
+    /**
+     * 审核意见
+     */
+    @NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String shyj;
+
+    /**
+     * 审核时间
+     */
+    @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date shsj;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

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

@@ -33,6 +33,10 @@ public class SysUserVo implements Serializable {
      */
     private Long userId;
 
+
+    /** 微信openid，微信唯一编码 */
+    private String openId;
+
     /**
      * 租户ID
      */

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

@@ -0,0 +1,96 @@
+package org.dromara.system.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.system.domain.ZhxyShyj;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 智慧校园_审核意见视图对象 zhxy_shyj
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ZhxyShyj.class)
+public class ZhxyShyjVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 老师id
+     */
+    @ExcelProperty(value = "老师id")
+    private Long teacherId;
+
+    /**
+     * 数据ID
+     */
+    @ExcelProperty(value = "数据ID")
+    private Long dataId;
+
+    /**
+     * 审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
+     */
+    @ExcelProperty(value = "审核类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=：学校注册，2：老师注册，3：家长注册，4：调课")
+    private String type;
+
+    /**
+     * 审核人id
+     */
+    @ExcelProperty(value = "审核人id")
+    private Long auditId;
+
+    /**
+     * 审核人名称
+     */
+    @ExcelProperty(value = "审核人名称")
+    private String auditUser;
+
+    /**
+     * 审核结果（是否通过  1：待审核，2：通过 3:不通过)
+     */
+    @ExcelProperty(value = "审核结果", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "审核结果（是否通过  1：待审核，2：通过 3:不通过)")
+    private String shjg;
+
+    /**
+     * 审核意见
+     */
+    @ExcelProperty(value = "审核意见")
+    private String shyj;
+
+    /**
+     * 审核时间
+     */
+    @ExcelProperty(value = "审核时间")
+    private Date shsj;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

@@ -6,6 +6,7 @@ import org.dromara.common.mybatis.annotation.DataColumn;
 import org.dromara.common.mybatis.annotation.DataPermission;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.vo.SysDeptVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -43,4 +44,14 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
      */
     List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
+    SysDept selectDeptByParentId(long parentId);
+
+    void insertDeptList(List<SysDept> sysDeptList);
+
+    void updateDeptIsStatus(Long parentId);
+
+    List<SysDeptVo> selectDeptListChildren(Long parentId);
+
+    List<SysDeptVo> selectDeptOldList(SysDeptBo dept);
+
 }

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

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.system.domain.ZhxyShyj;
+import org.dromara.system.domain.vo.ZhxyShyjVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 智慧校园_审核意见Mapper接口
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+public interface ZhxyShyjMapper extends BaseMapperPlus<ZhxyShyj, ZhxyShyjVo> {
+
+}

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

@@ -0,0 +1,49 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.ZhxyShyj;
+import org.dromara.system.domain.vo.ZhxyShyjVo;
+import org.dromara.system.domain.bo.ZhxyShyjBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 智慧校园_审核意见Service接口
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+public interface IZhxyShyjService {
+
+    /**
+     * 查询智慧校园_审核意见
+     */
+    ZhxyShyjVo queryById(Long id);
+
+    /**
+     * 查询智慧校园_审核意见列表
+     */
+    TableDataInfo<ZhxyShyjVo> queryPageList(ZhxyShyjBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询智慧校园_审核意见列表
+     */
+    List<ZhxyShyjVo> queryList(ZhxyShyjBo bo);
+
+    /**
+     * 新增智慧校园_审核意见
+     */
+    Boolean insertByBo(ZhxyShyjBo bo);
+
+    /**
+     * 修改智慧校园_审核意见
+     */
+    Boolean updateByBo(ZhxyShyjBo bo);
+
+    /**
+     * 校验并批量删除智慧校园_审核意见信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -27,11 +27,10 @@ import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.SysUserPost;
 import org.dromara.system.domain.SysUserRole;
 import org.dromara.system.domain.bo.SysUserBo;
-import org.dromara.system.domain.vo.SysPostVo;
-import org.dromara.system.domain.vo.SysRoleVo;
-import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.domain.vo.*;
 import org.dromara.system.mapper.*;
 import org.dromara.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +55,15 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     private final SysUserRoleMapper userRoleMapper;
     private final SysUserPostMapper userPostMapper;
 
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+    private RegisterParentsMapper registerParentsMapper;
+    private RegisterTeacherClassMapper registerTeacherClassMapper;
+    private RegisterTeacherMapper registerTeacherMapper;
+    private RegisterSchoolMapper registerSchoolMapper;
+    private RegisterSchoolFileMapper registerSchoolFileMapper;
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+
     @Override
     public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
         Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
@@ -436,7 +444,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      * @param roleIds 角色组
      * @param clear   清除已存在的关联数据
      */
-    private void insertUserRole(Long userId, Long[] roleIds, boolean clear) {
+    public void insertUserRole(Long userId, Long[] roleIds, boolean clear) {
         if (ArrayUtil.isNotEmpty(roleIds)) {
             // 判断是否具有此角色的操作权限
             List<SysRoleVo> roles = roleMapper.selectRoleList(new LambdaQueryWrapper<>());
@@ -499,6 +507,33 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         for (Long userId : userIds) {
             checkUserAllowed(userId);
             checkUserDataScope(userId);
+
+            //删除注册表
+            //获取openId
+            SysUser user = baseMapper.selectById(userId);
+            if(StringUtils.isNotEmpty(user.getOpenId())){
+                //删除学校表
+                registerSchoolMapper.deleteRegisterSchoolByPhonenumber(user.getPhonenumber());
+                //查询老师表
+                RegisterTeacherVo registerTeacher = registerTeacherMapper.selectRegisterTeacherByPhonenumber(user.getPhonenumber());
+                if(registerTeacher!=null){
+                    //删除老师表
+                    registerTeacherClassMapper.deleteRegisterTeacherClassByTeacherId(registerTeacher.getId());
+                    registerTeacherMapper.deleteById(registerTeacher.getId());
+                }
+
+                //删除学生数据
+                RegisterParentsVo registerParents = registerParentsMapper.selectRegisterParentsByPhonenumber(user.getPhonenumber());
+                if(registerParents!=null){
+                    //删除学生数据
+                    registerParentsMapper.deleteById(registerParents.getId());
+                    registerParentsStudentMapper.deleteRegisterParentsStudentByParentsId(registerParents.getId());
+                    formalParentsStudentMapper.deleteFormalParentsStudentByParentsId(userId);
+                    formalTeacherClassMapper.deleteFormalTeacherClassByTeacherId(userId);
+                }
+
+            }
+
         }
         List<Long> ids = List.of(userIds);
         // 删除用户与角色关联

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

@@ -0,0 +1,421 @@
+package org.dromara.system.service.impl;
+
+import cn.dev33.satoken.secure.BCrypt;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.RandomUtil;
+import org.dromara.common.core.domain.model.LoginUser;
+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;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.*;
+import org.dromara.system.domain.bo.*;
+import org.dromara.system.domain.vo.*;
+import org.dromara.system.mapper.*;
+import org.dromara.system.service.*;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 智慧校园_审核意见Service业务层处理
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@RequiredArgsConstructor
+@Service
+public class ZhxyShyjServiceImpl implements IZhxyShyjService {
+
+    private final ZhxyShyjMapper baseMapper;
+
+    private final IRegisterSchoolService registerSchoolService;
+    private final RegisterSchoolMapper registerSchoolMapper;
+
+    private final IRegisterSchoolFileService registerSchoolFileService;
+
+    private final RegisterSchoolFileMapper registerSchoolFileMapper;
+
+    private RegisterTeacherMapper registerTeacherMapper;
+    private RegisterParentsMapper registerParentsMapper;
+
+    private IRegisterTeacherClassService registerTeacherClassService;
+    private RegisterTeacherClassMapper registerTeacherClassMapper;
+
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+
+    private IRegisterParentsStudentService registerParentsStudentService;
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+    private IFormalParentsStudentService formalParentsStudentService;
+
+    private final SysTenantMapper sysTenantMapper;
+
+    private final SysDeptMapper sysDeptMapper;
+
+    private SysUserMapper userMapper;
+    private SysUserServiceImpl sysUserServiceImpl;
+
+    /**
+     * 查询智慧校园_审核意见
+     */
+    @Override
+    public ZhxyShyjVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询智慧校园_审核意见列表
+     */
+    @Override
+    public TableDataInfo<ZhxyShyjVo> queryPageList(ZhxyShyjBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZhxyShyj> lqw = buildQueryWrapper(bo);
+        Page<ZhxyShyjVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询智慧校园_审核意见列表
+     */
+    @Override
+    public List<ZhxyShyjVo> queryList(ZhxyShyjBo bo) {
+        LambdaQueryWrapper<ZhxyShyj> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZhxyShyj> buildQueryWrapper(ZhxyShyjBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ZhxyShyj> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getTeacherId() != null, ZhxyShyj::getTeacherId, bo.getTeacherId());
+        lqw.eq(bo.getDataId() != null, ZhxyShyj::getDataId, bo.getDataId());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), ZhxyShyj::getType, bo.getType());
+        lqw.eq(bo.getAuditId() != null, ZhxyShyj::getAuditId, bo.getAuditId());
+        lqw.eq(StringUtils.isNotBlank(bo.getAuditUser()), ZhxyShyj::getAuditUser, bo.getAuditUser());
+        lqw.eq(StringUtils.isNotBlank(bo.getShjg()), ZhxyShyj::getShjg, bo.getShjg());
+        lqw.eq(StringUtils.isNotBlank(bo.getShyj()), ZhxyShyj::getShyj, bo.getShyj());
+        lqw.eq(bo.getShsj() != null, ZhxyShyj::getShsj, bo.getShsj());
+        return lqw;
+    }
+
+    /**
+     * 新增智慧校园_审核意见
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(ZhxyShyjBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        bo.setAuditId(loginUser.getUserId());
+        bo.setAuditUser(loginUser.getNickname());
+        bo.setShsj(DateUtils.getNowDate());
+        bo.setCreateTime(DateUtils.getNowDate());
+        bo.setCreateTime(DateUtils.getNowDate());
+        //int index = zhxyShyjMapper.insertZhxyShyj(zhxyShyj);
+        //审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
+        //审核结果（是否通过  1：待审核，2：通过 3:不通过)
+        if("1".equals(bo.getType())){
+            //学校注册
+            if("2".equals(bo.getShjg())){
+                //通过  修改注册表审核结果，生成账号，部门表生成学校， 新增用户与角色管理
+                //查询数据信息
+                RegisterSchoolVo registerSchool = registerSchoolService.queryById(bo.getDataId());
+                //修改注册表审核结果
+                registerSchool.setAuditId(loginUser.getUserId());
+                registerSchool.setAuditUser(loginUser.getNickname());
+                registerSchool.setOpinion(bo.getShyj());
+                registerSchool.setIsPass(bo.getShjg());
+                registerSchool.setUpdateTime(DateUtils.getNowDate());
+
+                RegisterSchool schoolu = MapstructUtils.convert(registerSchool, RegisterSchool.class);
+                registerSchoolMapper.updateById(schoolu);
+                //生成租户信息
+                SysTenantBo tenantBo = new SysTenantBo();
+                tenantBo.setCompanyName(loginUser.getNickname());
+                tenantBo.setContactUserName(registerSchool.getUserName());
+                tenantBo.setContactPhone(registerSchool.getUserPhone());
+                tenantBo.setUsername(registerSchool.getUserPhone());
+                //Todo 租户套餐id
+                tenantBo.setPackageId(0l);
+                SysTenant sysTenant = MapstructUtils.convert(tenantBo, SysTenant.class);
+                // 获取所有租户编号
+                List<String> tenantIds = sysTenantMapper.selectObjs(
+                    new LambdaQueryWrapper<SysTenant>().select(SysTenant::getTenantId), Convert::toStr);
+                String tenantId = generateTenantId(tenantIds);
+                sysTenant.setTenantId(tenantId);
+                boolean flag = sysTenantMapper.insert(sysTenant) > 0;
+                if (!flag) {
+                    throw new ServiceException("创建租户失败");
+                }
+                tenantBo.setId(sysTenant.getId());
+
+                //部门表生成学校
+                SysDept dept = new SysDept();
+                dept.setParentId(0L);
+                dept.setAncestors("0");
+                dept.setDeptName(registerSchool.getSchoolName());
+                //查询最新的ParentId为100的数据
+                SysDept sysDept = sysDeptMapper.selectDeptByParentId(0L);
+                dept.setOrderNum(sysDept.getOrderNum()+1);
+                dept.setPhone(registerSchool.getUserPhone());
+                dept.setCreateTime(DateUtils.getNowDate());
+                sysDeptMapper.insert(dept);
+                //判断是否存在账号
+                SysUserVo use = userMapper.selectUserByUserName(registerSchool.getUserPhone());
+                if(use==null){
+                    use = new SysUserVo();
+                    //生成账号
+                    use.setOpenId(registerSchool.getOpenId());
+                    use.setDeptId(dept.getDeptId());
+                    use.setUserName(registerSchool.getUserPhone());
+                    use.setNickName(registerSchool.getSchoolName());
+                    use.setPhonenumber(registerSchool.getUserPhone());
+                    use.setPassword(BCrypt.hashpw("1qaz!QAZ"));
+                    use.setCreateTime(DateUtils.getNowDate());
+                    SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
+                    userMapper.insert(sysUser);
+                }else{
+                    use.setDeptId(dept.getDeptId());
+                    SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
+                    userMapper.insert(sysUser);
+                }
+                //新增用户与角色管理
+                Long[] roleIds = {4L};
+                sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds,false);
+            }else{
+                //不通过  修改注册表审核结果
+                //修改注册表审核结果
+                RegisterSchool registerSchool = new RegisterSchool();
+                registerSchool.setId(bo.getDataId());
+                registerSchool.setAuditId(loginUser.getUserId());
+                registerSchool.setAuditUser(loginUser.getNickname());
+                registerSchool.setOpinion(bo.getShyj());
+                registerSchool.setIsPass(bo.getShjg());
+                registerSchool.setUpdateTime(DateUtils.getNowDate());
+                registerSchoolMapper.updateById(registerSchool);
+            }
+        }else if("2".equals(bo.getType())){
+            //老师注册
+            if("2".equals(bo.getShjg())){
+                //通过  修改注册表审核结果，生成账号， 新增用户与角色管理，老师-班级（学科）数据
+                //查询数据信息
+                RegisterTeacherVo registerTeacher = registerTeacherMapper.selectVoById(bo.getDataId());
+                RegisterTeacherClassBo registerTeacherClass = new RegisterTeacherClassBo();
+                registerTeacherClass.setTeacherId(registerTeacher.getId());
+                List<RegisterTeacherClassVo> registerTeacherClassList = registerTeacherClassService.queryList(registerTeacherClass);
+                //修改注册表审核结果
+                registerTeacher.setAuditId(loginUser.getUserId());
+                registerTeacher.setAuditUser(loginUser.getNickname());
+                registerTeacher.setOpinion(bo.getShyj());
+                registerTeacher.setIsPass(bo.getShjg());
+                registerTeacher.setUpdateTime(DateUtils.getNowDate());
+                RegisterTeacher teacher = MapstructUtils.convert(registerTeacher, RegisterTeacher.class);
+                registerTeacherMapper.updateById(teacher);
+                //生成账号
+                //判断是否存在账号
+                SysUserVo use = userMapper.selectUserByUserName(registerTeacher.getUserPhone());
+                if(use==null){
+                    use = new SysUserVo();
+                    use.setOpenId(registerTeacher.getOpenId());
+                    use.setDeptId(registerTeacher.getSchoolId());
+                    use.setUserName(registerTeacher.getUserPhone());
+                    use.setNickName(registerTeacher.getUserName());
+                    use.setPhonenumber(registerTeacher.getUserPhone());
+                    use.setPassword(BCrypt.hashpw("1qaz!QAZ"));
+                    use.setCreateTime(DateUtils.getNowDate());
+                    SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
+                    userMapper.insert(sysUser);
+                }else{
+                    use.setDeptId(registerTeacher.getSchoolId());
+                    SysUser sysUser = MapstructUtils.convert(use, SysUser.class);
+                    userMapper.insert(sysUser);
+                }
+
+                //新增用户与角色管理
+                Long[] roleIds = {3L};
+                sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds,false);
+                //老师-班级（学科）数据
+                for (RegisterTeacherClassVo teacherClass : registerTeacherClassList) {
+                    FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+                    formalTeacherClass.setTeacherId(use.getUserId());
+                    formalTeacherClass.setTeacherName(use.getNickName());
+                    formalTeacherClass.setSchoolId(registerTeacher.getSchoolId());
+                    formalTeacherClass.setSchoolName(registerTeacher.getSchoolName());
+                    formalTeacherClass.setClassId(teacherClass.getClassId());
+                    formalTeacherClass.setClassName(teacherClass.getClassName());
+                    formalTeacherClass.setDiscipline(teacherClass.getDiscipline());
+                    formalTeacherClass.setCreateTime(DateUtils.getNowDate());
+                    formalTeacherClassMapper.insert(formalTeacherClass);
+                }
+
+            }else{
+                //不通过  修改注册表审核结果
+                //修改注册表审核结果
+                RegisterTeacher registerTeacher = new RegisterTeacher();
+                registerTeacher.setId(bo.getDataId());
+                registerTeacher.setAuditId(loginUser.getUserId());
+                registerTeacher.setAuditUser(loginUser.getNickname());
+                registerTeacher.setOpinion(bo.getShyj());
+                registerTeacher.setIsPass(bo.getShjg());
+                registerTeacher.setUpdateTime(DateUtils.getNowDate());
+                registerTeacherMapper.updateById(registerTeacher);
+            }
+        }else if("3".equals(bo.getType())) {
+            //审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
+            //家长注册
+            //查询数据信息
+            RegisterParentsStudentVo registerParentsStudent = registerParentsStudentMapper.selectVoById(bo.getDataId());
+            RegisterParentsVo registerParents = registerParentsMapper.selectVoById(registerParentsStudent.getParentsId());
+            if ("2".equals(bo.getShjg())) {
+
+                //通过  修改注册表审核结果，生成账号， 新增用户与角色管理，家长-学生(审核通过之后数据)
+                //查询是否存在账号
+                SysUserVo sysUser = userMapper.selectUserByUserName(registerParents.getUserPhone());
+
+                //修改注册表审核结果
+                registerParentsStudent.setAuditId(loginUser.getUserId());
+                registerParentsStudent.setAuditUser(loginUser.getNickname());
+                registerParentsStudent.setOpinion(bo.getShyj());
+                registerParentsStudent.setIsPass(bo.getShjg());
+                registerParentsStudent.setUpdateTime(DateUtils.getNowDate());
+
+                RegisterParentsStudent student = MapstructUtils.convert(registerParentsStudent, RegisterParentsStudent.class);
+                registerParentsStudentMapper.updateById(student);
+
+                if (sysUser == null) {
+                    //账号不存在
+                    registerParents.setIsPass(bo.getShjg());
+                    RegisterParents parents = MapstructUtils.convert(registerParents, RegisterParents.class);
+                    registerParentsMapper.updateById(parents);
+                    //生成账号
+                    sysUser = new SysUserVo();
+                    sysUser.setOpenId(registerParents.getOpenId());
+                    //use.setDeptId(dept.getDeptId());
+                    sysUser.setUserName(registerParents.getUserPhone());
+                    sysUser.setNickName(registerParents.getUserName());
+                    sysUser.setPhonenumber(registerParents.getUserPhone());
+                    sysUser.setPassword(BCrypt.hashpw("1qaz!QAZ"));
+                    sysUser.setCreateTime(DateUtils.getNowDate());
+                    SysUser use = MapstructUtils.convert(sysUser, SysUser.class);
+                    userMapper.insert(use);
+                    //新增用户与角色管理
+                    Long[] roleIds = {5L};
+                    sysUserServiceImpl.insertUserRole(sysUser.getUserId(), roleIds,false);
+                } else {
+                    FormalParentsStudentBo parentsStudent = new FormalParentsStudentBo();
+                    parentsStudent.setParentsId(sysUser.getUserId());
+                    List<FormalParentsStudentVo> parentsStudentList = formalParentsStudentService.queryList(parentsStudent);
+                    if (parentsStudentList == null || parentsStudentList.size() <= 0) {
+                        //新增用户与角色管理
+                        Long[] roleIds = {5L};
+                        sysUserServiceImpl.insertUserRole(sysUser.getUserId(), roleIds,false);
+                    }
+                }
+
+                //新增家长-学生(审核通过之后数据)
+                FormalParentsStudent formalParentsStudent = new FormalParentsStudent();
+                formalParentsStudent.setParentsId(sysUser.getUserId());
+                formalParentsStudent.setSchoolId(registerParentsStudent.getSchoolId());
+                formalParentsStudent.setSchoolName(registerParentsStudent.getSchoolName());
+                formalParentsStudent.setClassId(registerParentsStudent.getClassId());
+                formalParentsStudent.setClassName(registerParentsStudent.getClassName());
+                formalParentsStudent.setStudentName(registerParentsStudent.getStudentName());
+                formalParentsStudent.setStudentNumber(registerParentsStudent.getStudentNumber());
+                formalParentsStudent.setCreateTime(DateUtils.getNowDate());
+                formalParentsStudent.setCreateBy(loginUser.getUserId());
+                formalParentsStudentMapper.insertFormalParentsStudent(formalParentsStudent);
+
+            } else {
+                //不通过  修改注册表审核结果
+                //修改注册表审核结果
+                RegisterParentsStudent registerParentsStudentNo = new RegisterParentsStudent();
+                registerParentsStudentNo.setId(bo.getDataId());
+                registerParentsStudentNo.setAuditId(loginUser.getUserId());
+                registerParentsStudentNo.setAuditUser(loginUser.getNickname());
+                registerParentsStudentNo.setOpinion(bo.getShyj());
+                registerParentsStudentNo.setIsPass(bo.getShjg());
+                registerParentsStudentNo.setUpdateTime(DateUtils.getNowDate());
+                registerParentsStudentMapper.updateById(registerParentsStudentNo);
+                //判断是否所有的都不通过（查询是否存在待审核和审核通过的数据）
+                RegisterParentsStudentBo parentsStudent = new RegisterParentsStudentBo();
+                parentsStudent.setParentsId(registerParents.getId());
+                List<RegisterParentsStudentVo> registerParentsStudentList = registerParentsStudentService.queryList(parentsStudent);
+                Boolean bl = true;
+                for (RegisterParentsStudentVo student : registerParentsStudentList) {
+                    if (!"3".equals(student.getIsPass())) {
+                        bl = false;
+                        break;
+                    }
+                }
+                //全部都不通过才改家长表状态
+                if (bl) {
+                    registerParents.setIsPass(bo.getShjg());
+                    RegisterParents parents = MapstructUtils.convert(registerParents, RegisterParents.class);
+                    registerParentsMapper.updateById(parents);
+                }
+
+            }
+        }
+
+        ZhxyShyj add = MapstructUtils.convert(bo, ZhxyShyj.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改智慧校园_审核意见
+     */
+    @Override
+    public Boolean updateByBo(ZhxyShyjBo bo) {
+        ZhxyShyj update = MapstructUtils.convert(bo, ZhxyShyj.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZhxyShyj entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除智慧校园_审核意见
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 生成租户id
+     *
+     * @param tenantIds 已有租户id列表
+     * @return 租户id
+     */
+    private String generateTenantId(List<String> tenantIds) {
+        // 随机生成6位
+        String numbers = RandomUtil.randomNumbers(6);
+        // 判断是否存在，如果存在则重新生成
+        if (tenantIds.contains(numbers)) {
+            generateTenantId(tenantIds);
+        }
+        return numbers;
+    }
+}

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

@@ -26,4 +26,42 @@
         order by d.parent_id, d.order_num
     </select>
 
+
+
+    <select id="selectDeptByParentId" parameterType="Long" resultMap="SysDeptResult">
+        select * from sys_dept
+        where parent_id = #{parentId} order by create_time desc limit 1
+    </select>
+    <select id="selectDeptListChildren" resultMap="SysDeptResult" parameterType="SysDept">
+        select * from sys_dept
+        where d.del_flag = '0'
+        AND parent_id = #{parentId}
+        AND status = '0'
+    </select>
+    <select id="selectDeptOldList" resultMap="SysDeptResult">
+        select * from sys_dept
+        where del_flag = '0'
+        <if test="parentId != null and parentId != 0">
+            AND parent_id = #{parentId}
+        </if>
+        <if test="deptName != null and deptName != ''">
+            AND dept_name like concat('%', #{deptName}, '%')
+        </if>
+        <if test="status != null and status != ''">
+            AND status = #{status}
+        </if>
+        order by parent_id, order_num
+    </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=",">
+            (#{item.parentId},#{item.deptName},#{item.ancestors},#{item.orderNum},#{item.status},sysdate())
+        </foreach>
+    </insert>
+
+    <update id="updateDeptIsStatus" parameterType="java.lang.Long">
+        update sys_dept set status = '1' where parent_id = #{parentId}
+    </update>
+
 </mapper>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.ZhxyShyjMapper">
+
+</mapper>