注册

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/AppletController.java

@@ -1,21 +1,12 @@
 package com.ruoyi.web.controller.common;
 
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.config.ServerConfig;
-import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.IAppletService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
 /**小程序公共接口
  * @Author: tjf
  * @Date: 2023/5/25 11:46

ruoyi-admin/src/main/java/com/ruoyi/web/controller/course/CourseTableController.java

@@ -85,7 +85,7 @@ public class CourseTableController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:table:edit')")
     @Log(title = "课程", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody CourseTable courseTable)
     {
         return toAjax(courseTableService.updateCourseTable(courseTable));
@@ -96,7 +96,7 @@ public class CourseTableController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:table:remove')")
     @Log(title = "课程", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(courseTableService.deleteCourseTableByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/course/CourseTableTimeController.java

@@ -85,7 +85,7 @@ public class CourseTableTimeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:time:edit')")
     @Log(title = "课程-时间", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody CourseTableTime courseTableTime)
     {
         return toAjax(courseTableTimeService.updateCourseTableTime(courseTableTime));
@@ -96,7 +96,7 @@ public class CourseTableTimeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:time:remove')")
     @Log(title = "课程-时间", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(courseTableTimeService.deleteCourseTableTimeByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/formal/FormalParentsStudentController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.formal;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+import com.ruoyi.system.service.IFormalParentsStudentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 家长-学生(审核通过之后数据)Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@RestController
+@RequestMapping("/system/student")
+public class FormalParentsStudentController extends BaseController
+{
+    @Autowired
+    private IFormalParentsStudentService formalParentsStudentService;
+
+    /**
+     * 查询家长-学生(审核通过之后数据)列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:student:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FormalParentsStudent formalParentsStudent)
+    {
+        startPage();
+        List<FormalParentsStudent> list = formalParentsStudentService.selectFormalParentsStudentList(formalParentsStudent);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出家长-学生(审核通过之后数据)列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:student:export')")
+    @Log(title = "家长-学生(审核通过之后数据)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FormalParentsStudent formalParentsStudent)
+    {
+        List<FormalParentsStudent> list = formalParentsStudentService.selectFormalParentsStudentList(formalParentsStudent);
+        ExcelUtil<FormalParentsStudent> util = new ExcelUtil<FormalParentsStudent>(FormalParentsStudent.class);
+        util.exportExcel(response, list, "家长-学生(审核通过之后数据)数据");
+    }
+
+    /**
+     * 获取家长-学生(审核通过之后数据)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:student:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(formalParentsStudentService.selectFormalParentsStudentById(id));
+    }
+
+    /**
+     * 新增家长-学生(审核通过之后数据)
+     */
+    @PreAuthorize("@ss.hasPermi('system:student:add')")
+    @Log(title = "家长-学生(审核通过之后数据)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FormalParentsStudent formalParentsStudent)
+    {
+        return toAjax(formalParentsStudentService.insertFormalParentsStudent(formalParentsStudent));
+    }
+
+    /**
+     * 修改家长-学生(审核通过之后数据)
+     */
+    @PreAuthorize("@ss.hasPermi('system:student:edit')")
+    @Log(title = "家长-学生(审核通过之后数据)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FormalParentsStudent formalParentsStudent)
+    {
+        return toAjax(formalParentsStudentService.updateFormalParentsStudent(formalParentsStudent));
+    }
+
+    /**
+     * 删除家长-学生(审核通过之后数据)
+     */
+    @PreAuthorize("@ss.hasPermi('system:student:remove')")
+    @Log(title = "家长-学生(审核通过之后数据)", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(formalParentsStudentService.deleteFormalParentsStudentByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/FormalTeacherClassController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/formal/FormalTeacherClassController.java

@@ -1,46 +1,39 @@
-package com.ruoyi.web.controller.system;
+package com.ruoyi.web.controller.formal;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.vo.FormalTeacherClassVo;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
 import com.ruoyi.system.service.IFormalTeacherClassService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 老师-班级（学科）(审核通过之后数据)Controller
- * 
+ *
  * @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-30
  */
 @RestController
-@RequestMapping("/system/class")
-public class FormalTeacherClassController extends BaseController
-{
+@RequestMapping("/formal/class")
+public class FormalTeacherClassController extends BaseController {
     @Autowired
     private IFormalTeacherClassService formalTeacherClassService;
 
     /**
      * 查询老师-班级（学科）(审核通过之后数据)列表
      */
-    @PreAuthorize("@ss.hasPermi('system:class:list')")
+    @PreAuthorize("@ss.hasPermi('formal:class:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FormalTeacherClass formalTeacherClass)
-    {
+    public TableDataInfo list(FormalTeacherClass formalTeacherClass) {
         startPage();
         List<FormalTeacherClass> list = formalTeacherClassService.selectFormalTeacherClassList(formalTeacherClass);
         return getDataTable(list);
@@ -49,11 +42,10 @@ public class FormalTeacherClassController extends BaseController
     /**
      * 导出老师-班级（学科）(审核通过之后数据)列表
      */
-    @PreAuthorize("@ss.hasPermi('system:class:export')")
+    @PreAuthorize("@ss.hasPermi('formal:class:export')")
     @Log(title = "老师-班级（学科）(审核通过之后数据)", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, FormalTeacherClass formalTeacherClass)
-    {
+    public void export(HttpServletResponse response, FormalTeacherClass formalTeacherClass) {
         List<FormalTeacherClass> list = formalTeacherClassService.selectFormalTeacherClassList(formalTeacherClass);
         ExcelUtil<FormalTeacherClass> util = new ExcelUtil<FormalTeacherClass>(FormalTeacherClass.class);
         util.exportExcel(response, list, "老师-班级（学科）(审核通过之后数据)数据");
@@ -62,43 +54,50 @@ public class FormalTeacherClassController extends BaseController
     /**
      * 获取老师-班级（学科）(审核通过之后数据)详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:class:query')")
+    @PreAuthorize("@ss.hasPermi('formal:class:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(formalTeacherClassService.selectFormalTeacherClassById(id));
     }
 
     /**
      * 新增老师-班级（学科）(审核通过之后数据)
      */
-    @PreAuthorize("@ss.hasPermi('system:class:add')")
+    @PreAuthorize("@ss.hasPermi('formal:class:add')")
     @Log(title = "老师-班级（学科）(审核通过之后数据)", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody FormalTeacherClass formalTeacherClass)
-    {
+    public AjaxResult add(@RequestBody FormalTeacherClass formalTeacherClass) {
         return toAjax(formalTeacherClassService.insertFormalTeacherClass(formalTeacherClass));
     }
 
     /**
      * 修改老师-班级（学科）(审核通过之后数据)
      */
-    @PreAuthorize("@ss.hasPermi('system:class:edit')")
+    @PreAuthorize("@ss.hasPermi('formal:class:edit')")
     @Log(title = "老师-班级（学科）(审核通过之后数据)", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FormalTeacherClass formalTeacherClass)
-    {
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody FormalTeacherClass formalTeacherClass) {
         return toAjax(formalTeacherClassService.updateFormalTeacherClass(formalTeacherClass));
     }
 
+    /**
+     * 批量修改老师-班级（学科）(审核通过之后数据)
+     */
+    @PreAuthorize("@ss.hasPermi('formal:class:editAll')")
+    @Log(title = "老师-班级（学科）(审核通过之后数据)", businessType = BusinessType.UPDATE)
+    @PostMapping("/put/All")
+    public AjaxResult editAll(@RequestBody FormalTeacherClassVo formalTeacherClassVo) {
+        return formalTeacherClassService.updateFormalTeacherClassList(formalTeacherClassVo);
+    }
+
+
     /**
      * 删除老师-班级（学科）(审核通过之后数据)
      */
-    @PreAuthorize("@ss.hasPermi('system:class:remove')")
+    @PreAuthorize("@ss.hasPermi('formal:class:remove')")
     @Log(title = "老师-班级（学科）(审核通过之后数据)", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(formalTeacherClassService.deleteFormalTeacherClassByIds(ids));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterAll.java

@@ -0,0 +1,4 @@
+package com.ruoyi.web.controller.register;
+
+public class RegisterAll {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterParentsController.java

@@ -0,0 +1,102 @@
+package com.ruoyi.web.controller.register;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RegisterParents;
+import com.ruoyi.system.service.IRegisterParentsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 注册-家长Controller
+ * 
+ * @author boman
+ * @date 2023-05-25
+ */
+@RestController
+@RequestMapping("/register/parents")
+public class RegisterParentsController extends BaseController
+{
+    @Autowired
+    private IRegisterParentsService registerParentsService;
+
+    /**
+     * 查询注册-家长列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:parents:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RegisterParents registerParents)
+    {
+        startPage();
+        List<RegisterParents> list = registerParentsService.selectRegisterParentsList(registerParents);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出注册-家长列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:parents:export')")
+    @Log(title = "注册-家长", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RegisterParents registerParents)
+    {
+        List<RegisterParents> list = registerParentsService.selectRegisterParentsList(registerParents);
+        ExcelUtil<RegisterParents> util = new ExcelUtil<RegisterParents>(RegisterParents.class);
+        util.exportExcel(response, list, "注册-家长数据");
+    }
+
+    /**
+     * 获取注册-家长详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('register:parents:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(registerParentsService.selectRegisterParentsById(id));
+    }
+
+    /**
+     * 新增注册-家长
+     */
+    @Log(title = "注册-家长", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RegisterParents registerParents)
+    {
+        return registerParentsService.insertRegisterParents(registerParents);
+    }
+
+    /**
+     * 修改注册-家长
+     */
+    @Log(title = "注册-家长", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody RegisterParents registerParents)
+    {
+        return toAjax(registerParentsService.updateRegisterParents(registerParents));
+    }
+
+    /**
+     * 删除注册-家长
+     */
+    @PreAuthorize("@ss.hasPermi('register:parents:remove')")
+    @Log(title = "注册-家长", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(registerParentsService.deleteRegisterParentsByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterParentsStudentController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.register;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RegisterParentsStudent;
+import com.ruoyi.system.service.IRegisterParentsStudentService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 注册-家长-学生Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@RestController
+@RequestMapping("/register/student")
+public class RegisterParentsStudentController extends BaseController
+{
+    @Autowired
+    private IRegisterParentsStudentService registerParentsStudentService;
+
+    /**
+     * 查询注册-家长-学生列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:student:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RegisterParentsStudent registerParentsStudent)
+    {
+        startPage();
+        List<RegisterParentsStudent> list = registerParentsStudentService.selectRegisterParentsStudentList(registerParentsStudent);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出注册-家长-学生列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:student:export')")
+    @Log(title = "注册-家长-学生", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RegisterParentsStudent registerParentsStudent)
+    {
+        List<RegisterParentsStudent> list = registerParentsStudentService.selectRegisterParentsStudentList(registerParentsStudent);
+        ExcelUtil<RegisterParentsStudent> util = new ExcelUtil<RegisterParentsStudent>(RegisterParentsStudent.class);
+        util.exportExcel(response, list, "注册-家长-学生数据");
+    }
+
+    /**
+     * 获取注册-家长-学生详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('register:student:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(registerParentsStudentService.selectRegisterParentsStudentById(id));
+    }
+
+    /**
+     * 新增注册-家长-学生
+     */
+    @PreAuthorize("@ss.hasPermi('register:student:add')")
+    @Log(title = "注册-家长-学生", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RegisterParentsStudent registerParentsStudent)
+    {
+        return toAjax(registerParentsStudentService.insertRegisterParentsStudent(registerParentsStudent));
+    }
+
+    /**
+     * 修改注册-家长-学生
+     */
+    @PreAuthorize("@ss.hasPermi('register:student:edit')")
+    @Log(title = "注册-家长-学生", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody RegisterParentsStudent registerParentsStudent)
+    {
+        return toAjax(registerParentsStudentService.updateRegisterParentsStudent(registerParentsStudent));
+    }
+
+    /**
+     * 删除注册-家长-学生
+     */
+    @PreAuthorize("@ss.hasPermi('register:student:remove')")
+    @Log(title = "注册-家长-学生", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(registerParentsStudentService.deleteRegisterParentsStudentByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterSchoolController.java

@@ -0,0 +1,112 @@
+package com.ruoyi.web.controller.register;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RegisterSchool;
+import com.ruoyi.system.service.IRegisterSchoolService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 注册-学校Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+@RestController
+@RequestMapping("/register/school")
+public class RegisterSchoolController extends BaseController
+{
+    @Autowired
+    private IRegisterSchoolService registerSchoolService;
+
+    /**
+     * 查询注册-学校列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:school:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RegisterSchool registerSchool)
+    {
+        startPage();
+        List<RegisterSchool> list = registerSchoolService.selectRegisterSchoolList(registerSchool);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出注册-学校列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:school:export')")
+    @Log(title = "注册-学校", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RegisterSchool registerSchool)
+    {
+        List<RegisterSchool> list = registerSchoolService.selectRegisterSchoolList(registerSchool);
+        ExcelUtil<RegisterSchool> util = new ExcelUtil<RegisterSchool>(RegisterSchool.class);
+        util.exportExcel(response, list, "注册-学校数据");
+    }
+
+    /**
+     * 获取注册-学校详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('register:school:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(registerSchoolService.selectRegisterSchoolById(id));
+    }
+
+    /**
+     * 新增注册-学校
+     */
+    @Log(title = "注册-学校", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RegisterSchool registerSchool)
+    {
+        return registerSchoolService.insertRegisterSchool(registerSchool);
+    }
+
+    /**
+     * 修改注册-学校
+     */
+    @Log(title = "注册-学校", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody RegisterSchool registerSchool)
+    {
+        return toAjax(registerSchoolService.updateRegisterSchool(registerSchool));
+    }
+
+    /**
+     * 删除注册-学校
+     */
+    @PreAuthorize("@ss.hasPermi('register:school:remove')")
+    @Log(title = "注册-学校", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(registerSchoolService.deleteRegisterSchoolByIds(ids));
+    }
+
+    /**
+     * 注册信息查询
+     */
+    @GetMapping(value = "/query")
+    public AjaxResult queryInfo(String openId)
+    {
+        return registerSchoolService.queryInfo(openId);
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterSchoolFileController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.register;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RegisterSchoolFile;
+import com.ruoyi.system.service.IRegisterSchoolFileService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 注册-学校-附件Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+@RestController
+@RequestMapping("/register/file")
+public class RegisterSchoolFileController extends BaseController
+{
+    @Autowired
+    private IRegisterSchoolFileService registerSchoolFileService;
+
+    /**
+     * 查询注册-学校-附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:file:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RegisterSchoolFile registerSchoolFile)
+    {
+        startPage();
+        List<RegisterSchoolFile> list = registerSchoolFileService.selectRegisterSchoolFileList(registerSchoolFile);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出注册-学校-附件列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:file:export')")
+    @Log(title = "注册-学校-附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RegisterSchoolFile registerSchoolFile)
+    {
+        List<RegisterSchoolFile> list = registerSchoolFileService.selectRegisterSchoolFileList(registerSchoolFile);
+        ExcelUtil<RegisterSchoolFile> util = new ExcelUtil<RegisterSchoolFile>(RegisterSchoolFile.class);
+        util.exportExcel(response, list, "注册-学校-附件数据");
+    }
+
+    /**
+     * 获取注册-学校-附件详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('register:file:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(registerSchoolFileService.selectRegisterSchoolFileById(id));
+    }
+
+    /**
+     * 新增注册-学校-附件
+     */
+    @PreAuthorize("@ss.hasPermi('register:file:add')")
+    @Log(title = "注册-学校-附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RegisterSchoolFile registerSchoolFile)
+    {
+        return toAjax(registerSchoolFileService.insertRegisterSchoolFile(registerSchoolFile));
+    }
+
+    /**
+     * 修改注册-学校-附件
+     */
+    @PreAuthorize("@ss.hasPermi('register:file:edit')")
+    @Log(title = "注册-学校-附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RegisterSchoolFile registerSchoolFile)
+    {
+        return toAjax(registerSchoolFileService.updateRegisterSchoolFile(registerSchoolFile));
+    }
+
+    /**
+     * 删除注册-学校-附件
+     */
+    @PreAuthorize("@ss.hasPermi('register:file:remove')")
+    @Log(title = "注册-学校-附件", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(registerSchoolFileService.deleteRegisterSchoolFileByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterTeacherClassController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.register;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+import com.ruoyi.system.service.IRegisterTeacherClassService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 注册-老师-班级（学科）Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@RestController
+@RequestMapping("/register/class")
+public class RegisterTeacherClassController extends BaseController
+{
+    @Autowired
+    private IRegisterTeacherClassService registerTeacherClassService;
+
+    /**
+     * 查询注册-老师-班级（学科）列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:class:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RegisterTeacherClass registerTeacherClass)
+    {
+        startPage();
+        List<RegisterTeacherClass> list = registerTeacherClassService.selectRegisterTeacherClassList(registerTeacherClass);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出注册-老师-班级（学科）列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:class:export')")
+    @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RegisterTeacherClass registerTeacherClass)
+    {
+        List<RegisterTeacherClass> list = registerTeacherClassService.selectRegisterTeacherClassList(registerTeacherClass);
+        ExcelUtil<RegisterTeacherClass> util = new ExcelUtil<RegisterTeacherClass>(RegisterTeacherClass.class);
+        util.exportExcel(response, list, "注册-老师-班级（学科）数据");
+    }
+
+    /**
+     * 获取注册-老师-班级（学科）详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('register:class:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(registerTeacherClassService.selectRegisterTeacherClassById(id));
+    }
+
+    /**
+     * 新增注册-老师-班级（学科）
+     */
+    @PreAuthorize("@ss.hasPermi('register:class:add')")
+    @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RegisterTeacherClass registerTeacherClass)
+    {
+        return toAjax(registerTeacherClassService.insertRegisterTeacherClass(registerTeacherClass));
+    }
+
+    /**
+     * 修改注册-老师-班级（学科）
+     */
+    @PreAuthorize("@ss.hasPermi('register:class:edit')")
+    @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody RegisterTeacherClass registerTeacherClass)
+    {
+        return toAjax(registerTeacherClassService.updateRegisterTeacherClass(registerTeacherClass));
+    }
+
+    /**
+     * 删除注册-老师-班级（学科）
+     */
+    @PreAuthorize("@ss.hasPermi('register:class:remove')")
+    @Log(title = "注册-老师-班级（学科）", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(registerTeacherClassService.deleteRegisterTeacherClassByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterTeacherController.java

@@ -0,0 +1,101 @@
+package com.ruoyi.web.controller.register;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.RegisterTeacher;
+import com.ruoyi.system.service.IRegisterTeacherService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 注册-老师Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@RestController
+@RequestMapping("/register/teacher")
+public class RegisterTeacherController extends BaseController
+{
+    @Autowired
+    private IRegisterTeacherService registerTeacherService;
+
+    /**
+     * 查询注册-老师列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:teacher:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RegisterTeacher registerTeacher)
+    {
+        startPage();
+        List<RegisterTeacher> list = registerTeacherService.selectRegisterTeacherList(registerTeacher);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出注册-老师列表
+     */
+    @PreAuthorize("@ss.hasPermi('register:teacher:export')")
+    @Log(title = "注册-老师", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RegisterTeacher registerTeacher)
+    {
+        List<RegisterTeacher> list = registerTeacherService.selectRegisterTeacherList(registerTeacher);
+        ExcelUtil<RegisterTeacher> util = new ExcelUtil<RegisterTeacher>(RegisterTeacher.class);
+        util.exportExcel(response, list, "注册-老师数据");
+    }
+
+    /**
+     * 获取注册-老师详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(registerTeacherService.selectRegisterTeacherById(id));
+    }
+
+    /**
+     * 新增注册-老师
+     */
+    @Log(title = "注册-老师", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RegisterTeacher registerTeacher)
+    {
+        return registerTeacherService.insertRegisterTeacher(registerTeacher);
+    }
+
+    /**
+     * 修改注册-老师
+     */
+    @Log(title = "注册-老师", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody RegisterTeacher registerTeacher)
+    {
+        return toAjax(registerTeacherService.updateRegisterTeacher(registerTeacher));
+    }
+
+    /**
+     * 删除注册-老师
+     */
+    @PreAuthorize("@ss.hasPermi('register:teacher:remove')")
+    @Log(title = "注册-老师", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(registerTeacherService.deleteRegisterTeacherByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/SysUserDeptController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.register;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.SysUserDept;
+import com.ruoyi.system.service.ISysUserDeptService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户和部门关联Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@RestController
+@RequestMapping("/system/deptUser")
+public class SysUserDeptController extends BaseController
+{
+    @Autowired
+    private ISysUserDeptService sysUserDeptService;
+
+    /**
+     * 查询用户和部门关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUserDept sysUserDept)
+    {
+        startPage();
+        List<SysUserDept> list = sysUserDeptService.selectSysUserDeptList(sysUserDept);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户和部门关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:export')")
+    @Log(title = "用户和部门关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysUserDept sysUserDept)
+    {
+        List<SysUserDept> list = sysUserDeptService.selectSysUserDeptList(sysUserDept);
+        ExcelUtil<SysUserDept> util = new ExcelUtil<SysUserDept>(SysUserDept.class);
+        util.exportExcel(response, list, "用户和部门关联数据");
+    }
+
+    /**
+     * 获取用户和部门关联详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return success(sysUserDeptService.selectSysUserDeptByUserId(userId));
+    }
+
+    /**
+     * 新增用户和部门关联
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:add')")
+    @Log(title = "用户和部门关联", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysUserDept sysUserDept)
+    {
+        return toAjax(sysUserDeptService.insertSysUserDept(sysUserDept));
+    }
+
+    /**
+     * 修改用户和部门关联
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+    @Log(title = "用户和部门关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysUserDept sysUserDept)
+    {
+        return toAjax(sysUserDeptService.updateSysUserDept(sysUserDept));
+    }
+
+    /**
+     * 删除用户和部门关联
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+    @Log(title = "用户和部门关联", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(sysUserDeptService.deleteSysUserDeptByUserIds(userIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shyj/ZhxyShyjController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.shyj;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.ZhxyShyj;
+import com.ruoyi.system.service.IZhxyShyjService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 智慧校园_审核意见Controller
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@RestController
+@RequestMapping("/audit/shyj")
+public class ZhxyShyjController extends BaseController
+{
+    @Autowired
+    private IZhxyShyjService zhxyShyjService;
+
+    /**
+     * 查询智慧校园_审核意见列表
+     */
+    @PreAuthorize("@ss.hasPermi('audit:shyj:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ZhxyShyj zhxyShyj)
+    {
+        startPage();
+        List<ZhxyShyj> list = zhxyShyjService.selectZhxyShyjList(zhxyShyj);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出智慧校园_审核意见列表
+     */
+    @PreAuthorize("@ss.hasPermi('audit:shyj:export')")
+    @Log(title = "智慧校园_审核意见", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZhxyShyj zhxyShyj)
+    {
+        List<ZhxyShyj> list = zhxyShyjService.selectZhxyShyjList(zhxyShyj);
+        ExcelUtil<ZhxyShyj> util = new ExcelUtil<ZhxyShyj>(ZhxyShyj.class);
+        util.exportExcel(response, list, "智慧校园_审核意见数据");
+    }
+
+    /**
+     * 获取智慧校园_审核意见详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('audit:shyj:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(zhxyShyjService.selectZhxyShyjById(id));
+    }
+
+    /**
+     * 新增智慧校园_审核意见
+     */
+    @PreAuthorize("@ss.hasPermi('audit:shyj:add')")
+    @Log(title = "智慧校园_审核意见", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZhxyShyj zhxyShyj)
+    {
+        return toAjax(zhxyShyjService.insertZhxyShyj(zhxyShyj));
+    }
+
+    /**
+     * 修改智慧校园_审核意见
+     */
+    @PreAuthorize("@ss.hasPermi('audit:shyj:edit')")
+    @Log(title = "智慧校园_审核意见", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZhxyShyj zhxyShyj)
+    {
+        return toAjax(zhxyShyjService.updateZhxyShyj(zhxyShyj));
+    }
+
+    /**
+     * 删除智慧校园_审核意见
+     */
+    @PreAuthorize("@ss.hasPermi('audit:shyj:remove')")
+    @Log(title = "智慧校园_审核意见", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zhxyShyjService.deleteZhxyShyjByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.vo.SysDeptVo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -45,6 +47,40 @@ public class SysDeptController extends BaseController
         return success(depts);
     }
 
+    /**
+     * 获取部门列表(无权限控制)
+     */
+    @GetMapping("/noAuthority/list")
+    public AjaxResult noAuthorityList(SysDept dept)
+    {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return success(depts);
+    }
+
+    /**
+     * 获取学校班级数据，分成6个年级（目前只有小学）（parentId必传）
+     */
+    @GetMapping("/six/list/{parentId}")
+    public AjaxResult sixListByparentId(@PathVariable("parentId") Long parentId)
+    {
+        if(parentId==null || parentId == 0L ){
+            return error("参数错误");
+        }
+        SysDept dept = new SysDept();
+        dept.setParentId(parentId);
+        return deptService.selectDeptSixList(dept);
+    }
+
+    /**
+     * 获取部门列表查询子部门（parentId必传）
+     */
+    @GetMapping("/list/{parentId}")
+    public AjaxResult listByparentId(@PathVariable("parentId") Long parentId)
+    {
+        List<SysDept> depts = deptService.selectDeptListChildren(parentId);
+        return success(depts);
+    }
+
     /**
      * 查询部门列表（排除节点）
      */
@@ -94,12 +130,24 @@ public class SysDeptController extends BaseController
         return toAjax(deptService.insertDept(dept));
     }
 
+    /**
+     * 新增部门(批量)
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:addAll')")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping("/addAll")
+    public AjaxResult addAll(@Validated @RequestBody SysDeptVo sysDeptVo)
+    {
+
+        return deptService.insertDeptList(sysDeptVo);
+    }
+
     /**
      * 修改部门
      */
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
     {
         Long deptId = dept.getDeptId();
@@ -125,7 +173,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{deptId}")
+    @GetMapping("/delete/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)
     {
         if (deptService.hasChildByDeptId(deptId))

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -3,8 +3,12 @@ package com.ruoyi.web.controller.system;
 import java.util.List;
 import java.util.Set;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.framework.utils.WxCodeSessionUtil;
 import com.ruoyi.framework.web.domain.AppletLoginForm;
+import com.ruoyi.framework.web.domain.AppletSessionDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -70,6 +74,21 @@ public class SysLoginController
         return ajax;
     }
 
+    /**
+     * 解码微信Openid
+     *
+     * @param  form 登录信息
+     * @return 结果
+     */
+    @PostMapping("/weChatOpenid")
+    public AjaxResult weChatOpenid(@RequestBody AppletLoginForm form)
+    {
+
+        AppletSessionDTO dto = WxCodeSessionUtil.jscode2Session(form);
+        return AjaxResult.success("成功",dto);
+    }
+
+
     /**
      * 获取用户信息
      * 
@@ -89,6 +108,9 @@ public class SysLoginController
                 if ("teacher".equals(role)){
                     permissionService.getTeacherClass(user);
                 }
+                if("parents".equals(role)){
+                    permissionService.getParentsStudent(user);
+                }
             }
         }
         AjaxResult ajax = AjaxResult.success();

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FormalParentsStudent.java

@@ -0,0 +1,165 @@
+package com.ruoyi.common.core.domain.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 家长-学生(审核通过之后数据)对象 formal_parents_student
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public class FormalParentsStudent extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 家长id */
+    @Excel(name = "家长id")
+    private Long parentsId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String parentsName;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式")
+    private String parentsPhone;
+
+    /** 学校id */
+    @Excel(name = "学校id")
+    private Long schoolId;
+
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 班级id */
+    @Excel(name = "班级id")
+    private Long classId;
+
+    /** 班级名称 */
+    @Excel(name = "班级名称")
+    private String className;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String studentName;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setParentsId(Long parentsId)
+    {
+        this.parentsId = parentsId;
+    }
+
+    public Long getParentsId()
+    {
+        return parentsId;
+    }
+
+    public String getParentsName() {
+        return parentsName;
+    }
+
+    public String getParentsPhone() {
+        return parentsPhone;
+    }
+
+    public void setParentsName(String parentsName) {
+        this.parentsName = parentsName;
+    }
+
+    public void setParentsPhone(String parentsPhone) {
+        this.parentsPhone = parentsPhone;
+    }
+
+    public void setSchoolId(Long schoolId)
+    {
+        this.schoolId = schoolId;
+    }
+
+    public Long getSchoolId()
+    {
+        return schoolId;
+    }
+    public void setSchoolName(String schoolName) 
+    {
+        this.schoolName = schoolName;
+    }
+
+    public String getSchoolName() 
+    {
+        return schoolName;
+    }
+    public void setClassId(Long classId)
+    {
+        this.classId = classId;
+    }
+
+    public Long getClassId()
+    {
+        return classId;
+    }
+    public void setClassName(String className) 
+    {
+        this.className = className;
+    }
+
+    public String getClassName() 
+    {
+        return className;
+    }
+    public void setStudentName(String studentName) 
+    {
+        this.studentName = studentName;
+    }
+
+    public String getStudentName() 
+    {
+        return studentName;
+    }
+    public void setStudentNumber(String studentNumber) 
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber() 
+    {
+        return studentNumber;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("parentsId", getParentsId())
+            .append("schoolId", getSchoolId())
+            .append("schoolName", getSchoolName())
+            .append("classId", getClassId())
+            .append("className", getClassName())
+            .append("studentName", getStudentName())
+            .append("studentNumber", getStudentNumber())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FormalTeacherClass.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 老师-班级（学科）(审核通过之后数据)对象 formal_teacher_class
  * 
  * @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-30
  */
 public class FormalTeacherClass extends BaseEntity
 {
@@ -20,11 +20,15 @@ public class FormalTeacherClass extends BaseEntity
 
     /** 老师id */
     @Excel(name = "老师id")
-    private String teacherId;
+    private Long teacherId;
+
+    /** 老师名称 */
+    @Excel(name = "老师名称")
+    private String teacherName;
 
     /** 学校id */
     @Excel(name = "学校id")
-    private String schoolId;
+    private Long schoolId;
 
     /** 学校名称 */
     @Excel(name = "学校名称")
@@ -32,7 +36,7 @@ public class FormalTeacherClass extends BaseEntity
 
     /** 班级id */
     @Excel(name = "班级id")
-    private String classId;
+    private Long classId;
 
     /** 班级名称 */
     @Excel(name = "班级名称")
@@ -51,21 +55,21 @@ public class FormalTeacherClass extends BaseEntity
     {
         return id;
     }
-    public void setTeacherId(String teacherId) 
+    public void setTeacherId(Long teacherId)
     {
         this.teacherId = teacherId;
     }
 
-    public String getTeacherId() 
+    public Long getTeacherId()
     {
         return teacherId;
     }
-    public void setSchoolId(String schoolId) 
+    public void setSchoolId(Long schoolId)
     {
         this.schoolId = schoolId;
     }
 
-    public String getSchoolId() 
+    public Long getSchoolId()
     {
         return schoolId;
     }
@@ -78,12 +82,12 @@ public class FormalTeacherClass extends BaseEntity
     {
         return schoolName;
     }
-    public void setClassId(String classId) 
+    public void setClassId(Long classId)
     {
         this.classId = classId;
     }
 
-    public String getClassId() 
+    public Long getClassId()
     {
         return classId;
     }
@@ -106,6 +110,14 @@ public class FormalTeacherClass extends BaseEntity
         return discipline;
     }
 
+    public String getTeacherName() {
+        return teacherName;
+    }
+
+    public void setTeacherName(String teacherName) {
+        this.teacherName = teacherName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -55,6 +55,18 @@ public class SysDept extends BaseEntity
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
+
+    /** 是否是当前次新增（Y:是，N否） */
+    private String isAdd;
+
+    public String getIsAdd() {
+        return isAdd;
+    }
+
+    public void setIsAdd(String isAdd) {
+        this.isAdd = isAdd;
+    }
+
     public Long getDeptId()
     {
         return deptId;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -29,6 +29,9 @@ public class SysUser extends BaseEntity
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
+    /** 微信openid，微信唯一编码 */
+    private String openId;
+
     /** 用户账号 */
     @Excel(name = "登录名称")
     private String userName;
@@ -91,6 +94,16 @@ public class SysUser extends BaseEntity
 
     private List<FormalTeacherClass> teacherClass;
 
+    private List<FormalParentsStudent> parentsStudent;
+
+    public List<FormalParentsStudent> getParentsStudent() {
+        return parentsStudent;
+    }
+
+    public void setParentsStudent(List<FormalParentsStudent> parentsStudent) {
+        this.parentsStudent = parentsStudent;
+    }
+
     public List<FormalTeacherClass> getTeacherClass() {
         return teacherClass;
     }
@@ -104,6 +117,14 @@ public class SysUser extends BaseEntity
 
     }
 
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
     public SysUser(Long userId)
     {
         this.userId = userId;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/vo/FormalTeacherClassVo.java

@@ -0,0 +1,18 @@
+package com.ruoyi.common.core.domain.entity.vo;
+
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+
+import java.util.List;
+
+public class FormalTeacherClassVo {
+
+    private List<FormalTeacherClass> pormalTeacherClassList;
+
+    public List<FormalTeacherClass> getPormalTeacherClassList() {
+        return pormalTeacherClassList;
+    }
+
+    public void setPormalTeacherClassList(List<FormalTeacherClass> pormalTeacherClassList) {
+        this.pormalTeacherClassList = pormalTeacherClassList;
+    }
+}

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/vo/SysDeptVo.java

@@ -0,0 +1,18 @@
+package com.ruoyi.common.core.domain.entity.vo;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+
+import java.util.List;
+
+public class SysDeptVo {
+
+    private List<SysDept>  sysDeptList;
+
+    public List<SysDept> getSysDeptList() {
+        return sysDeptList;
+    }
+
+    public void setSysDeptList(List<SysDept> sysDeptList) {
+        this.sysDeptList = sysDeptList;
+    }
+}

ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java

@@ -71,6 +71,11 @@ public class ProcessConstants {
     public static final String PROCESS_INITIATOR = "INITIATOR";
 
 
+    /**
+     * 审批结果
+     */
+    public static final Boolean ISPASS = true;
+
     /**
      * 流程跳过
      */

ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowInstanceController.java

@@ -61,4 +61,14 @@ public class FlowInstanceController {
         }
         return AjaxResult.success();
     }
+
+    @ApiOperation(value = "删除流程实例")
+    @GetMapping(value = "/get/delete/{instanceIds}")
+    public AjaxResult getDelete(@ApiParam(value = "流程实例ID", required = true) @PathVariable String[] instanceIds,
+                             @ApiParam(value = "删除原因") @RequestParam(required = false) String deleteReason) {
+        for (String instanceId : instanceIds) {
+            flowInstanceService.delete(instanceId,deleteReason);
+        }
+        return AjaxResult.success();
+    }
 }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -108,6 +108,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             taskService.setAssignee(taskVo.getTaskId(), userId.toString());
             taskService.complete(taskVo.getTaskId(), taskVo.getVariables());
         }
+
         return AjaxResult.success();
     }
 
@@ -219,13 +220,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 runtimeService.createChangeActivityStateBuilder()
                         .processInstanceId(task.getProcessInstanceId()).
                         moveSingleActivityIdToActivityIds(currentIds.get(0), targetIds).changeState();
-            }
-            // 如果父级任务只有一个，因此当前任务可能为网关中的任务
-            if (targetIds.size() == 1) {
+            }else if (targetIds.size() == 1) {
+                // 如果父级任务只有一个，因此当前任务可能为网关中的任务
                 // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetIds.get(0) 跳转到的节点(1)
                 runtimeService.createChangeActivityStateBuilder()
                         .processInstanceId(task.getProcessInstanceId())
                         .moveActivityIdsToSingleActivityId(currentIds, targetIds.get(0)).changeState();
+            }else{
+                runtimeService.createChangeActivityStateBuilder()
+                        .processInstanceId(task.getProcessInstanceId())
+                        .moveActivityIdsToSingleActivityId(currentIds, parentUserTaskKeyList.get(0)).changeState();
             }
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -111,7 +111,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/weChatLogin","/common/upload","/flowable/definition/list","/flowable/task/flowFormData","/flowable/task/flowXmlAndNode").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/weChatLogin","/weChatOpenid","/common/upload",
+                        //"/flowable/task/flowFormData","/flowable/task/flowXmlAndNode","/flowable/task/flowRecord","/flowable/task/nextFlowNodeByStart",
+                        "/flowable/definition/**","/register/school","/register/school/query","/system/dept/list/**",
+                        "/system/dict/data/type/**","/register/teacher","/register/teacher/put","/register/parents","/register/parents/put").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -35,7 +35,6 @@ import com.ruoyi.framework.security.context.AuthenticationContextHolder;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
-import static com.sun.xml.internal.ws.spi.db.BindingContextFactory.LOGGER;
 
 /**
  * 登录校验方法
@@ -123,11 +122,13 @@ public class SysLoginService
         // （若当前小程序已绑定到微信开放平台帐号） 和 会话密钥 session_key
         AppletSessionDTO dto = WxCodeSessionUtil.jscode2Session(form);
         String phoneNumber = dto.getPhoneNumber();
-        if (StringUtils.isBlank(phoneNumber)){
+        String openId= dto.getOpenId();
+        if (StringUtils.isBlank(phoneNumber) || StringUtils.isBlank(openId)){
             throw new BaseException("对不起，未获取到手机号");
         }
 
-        SysUser user = userService.getByPhone(dto.getPhoneNumber());
+        //SysUser user = userService.getByPhone(dto.getPhoneNumber());
+        SysUser user = userService.getByOpenId(openId);
         if (user == null){
             throw new BaseException("对不起，未获取到相关信息");
         }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java

@@ -4,8 +4,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
 import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+import com.ruoyi.system.mapper.FormalParentsStudentMapper;
 import com.ruoyi.system.service.IFormalTeacherClassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,6 +31,9 @@ public class SysPermissionService
 
     @Autowired
     private IFormalTeacherClassService formalTeacherClassService;
+    @Autowired
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+
 
     /**
      * 获取角色数据权限
@@ -99,4 +103,12 @@ public class SysPermissionService
         }
         return perms;
     }
+
+    public void getParentsStudent(SysUser user) {
+
+        FormalParentsStudent formalParentsStudent = new FormalParentsStudent();
+        formalParentsStudent.setParentsId(user.getUserId());
+        List<FormalParentsStudent> parentsStudent = formalParentsStudentMapper.selectFormalParentsStudentList(formalParentsStudent);
+        user.setParentsStudent(parentsStudent);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/RegisterParents.java

@@ -0,0 +1,104 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 注册-家长对象 register_parents
+ * 
+ * @author boman
+ * @date 2023-05-25
+ */
+public class RegisterParents extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    private String openId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String userName;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式")
+    private String userPhone;
+
+    /** 审核结果 */
+    @Excel(name = "审核结果")
+    private String isPass;
+
+    private List<RegisterParentsStudent> registerParentsStudentList;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setUserPhone(String userPhone) 
+    {
+        this.userPhone = userPhone;
+    }
+
+    public String getUserPhone() 
+    {
+        return userPhone;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public String getIsPass() {
+        return isPass;
+    }
+
+    public void setIsPass(String isPass) {
+        this.isPass = isPass;
+    }
+
+    public List<RegisterParentsStudent> getRegisterParentsStudentList() {
+        return registerParentsStudentList;
+    }
+
+    public void setRegisterParentsStudentList(List<RegisterParentsStudent> registerParentsStudentList) {
+        this.registerParentsStudentList = registerParentsStudentList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userName", getUserName())
+            .append("userPhone", getUserPhone())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/RegisterParentsStudent.java

@@ -0,0 +1,230 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 注册-家长-学生对象 register_parents_student
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public class RegisterParentsStudent extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 家长id */
+    @Excel(name = "家长id")
+    private Long parentsId;
+
+    /** 家长姓名 */
+    @Excel(name = "家长姓名")
+    private String parentsName;
+
+    /** 家长联系方式 */
+    @Excel(name = "家长联系方式")
+    private String parentsPhone;
+
+    /** 学校id */
+    @Excel(name = "学校id")
+    private Long schoolId;
+
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 班级id */
+    @Excel(name = "班级id")
+    private Long classId;
+
+    /** 班级名称 */
+    @Excel(name = "班级名称")
+    private String className;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String studentName;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    /** 审核结果 */
+    @Excel(name = "审核结果")
+    private String isPass;
+
+    private Long auditId;
+
+    private String auditUser;
+
+    private String opinion;
+
+    private Long teacherId;
+
+    private List<Long> classIds;
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public List<Long> getClassIds() {
+        return classIds;
+    }
+
+    public void setClassIds(List<Long> classIds) {
+        this.classIds = classIds;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setParentsId(Long parentsId)
+    {
+        this.parentsId = parentsId;
+    }
+
+    public Long getParentsId()
+    {
+        return parentsId;
+    }
+    public void setSchoolId(Long schoolId)
+    {
+        this.schoolId = schoolId;
+    }
+
+    public Long getSchoolId()
+    {
+        return schoolId;
+    }
+    public void setSchoolName(String schoolName) 
+    {
+        this.schoolName = schoolName;
+    }
+
+    public String getSchoolName() 
+    {
+        return schoolName;
+    }
+    public void setClassId(Long classId)
+    {
+        this.classId = classId;
+    }
+
+    public Long getClassId()
+    {
+        return classId;
+    }
+    public void setClassName(String className) 
+    {
+        this.className = className;
+    }
+
+    public String getClassName() 
+    {
+        return className;
+    }
+    public void setStudentName(String studentName) 
+    {
+        this.studentName = studentName;
+    }
+
+    public String getStudentName() 
+    {
+        return studentName;
+    }
+    public void setStudentNumber(String studentNumber) 
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber() 
+    {
+        return studentNumber;
+    }
+    public void setIsPass(String isPass) 
+    {
+        this.isPass = isPass;
+    }
+
+    public String getIsPass() 
+    {
+        return isPass;
+    }
+
+    public Long getAuditId() {
+        return auditId;
+    }
+
+    public String getAuditUser() {
+        return auditUser;
+    }
+
+    public String getOpinion() {
+        return opinion;
+    }
+
+    public void setAuditId(Long auditId) {
+        this.auditId = auditId;
+    }
+
+    public void setAuditUser(String auditUser) {
+        this.auditUser = auditUser;
+    }
+
+    public void setOpinion(String opinion) {
+        this.opinion = opinion;
+    }
+
+    public String getParentsName() {
+        return parentsName;
+    }
+
+    public String getParentsPhone() {
+        return parentsPhone;
+    }
+
+    public void setParentsName(String parentsName) {
+        this.parentsName = parentsName;
+    }
+
+    public void setParentsPhone(String parentsPhone) {
+        this.parentsPhone = parentsPhone;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("parentsId", getParentsId())
+            .append("schoolId", getSchoolId())
+            .append("schoolName", getSchoolName())
+            .append("classId", getClassId())
+            .append("className", getClassName())
+            .append("studentName", getStudentName())
+            .append("studentNumber", getStudentNumber())
+            .append("isPass", getIsPass())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/RegisterSchool.java

@@ -0,0 +1,153 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 注册-学校对象 register_school
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public class RegisterSchool extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+
+    private String openId;
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String userName;
+
+    /** 负责人联系方式 */
+    @Excel(name = "负责人联系方式")
+    private String userPhone;
+
+    /** 审核结果（1：待审核，2：通过，3：不通过） */
+    @Excel(name = "审核结果", readConverterExp = "1=：待审核，2：通过，3：不通过")
+    private String isPass;
+
+    private Long auditId;
+
+    private String auditUser;
+
+    private String opinion;
+
+
+    /** 注册-学校-附件对象 */
+    @Excel(name = "注册-学校-附件对象")
+    private List<RegisterSchoolFile> registerSchoolFileList;
+
+    public List<RegisterSchoolFile> getRegisterSchoolFileList() {
+        return registerSchoolFileList;
+    }
+
+    public void setRegisterSchoolFileList(List<RegisterSchoolFile> registerSchoolFileList) {
+        this.registerSchoolFileList = registerSchoolFileList;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSchoolName(String schoolName) 
+    {
+        this.schoolName = schoolName;
+    }
+
+    public String getSchoolName() 
+    {
+        return schoolName;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setUserPhone(String userPhone) 
+    {
+        this.userPhone = userPhone;
+    }
+
+    public String getUserPhone() 
+    {
+        return userPhone;
+    }
+    public void setIsPass(String isPass) 
+    {
+        this.isPass = isPass;
+    }
+
+    public String getIsPass() 
+    {
+        return isPass;
+    }
+
+    public Long getAuditId() {
+        return auditId;
+    }
+
+    public String getAuditUser() {
+        return auditUser;
+    }
+
+    public String getOpinion() {
+        return opinion;
+    }
+
+    public void setAuditId(Long auditId) {
+        this.auditId = auditId;
+    }
+
+    public void setAuditUser(String auditUser) {
+        this.auditUser = auditUser;
+    }
+
+    public void setOpinion(String opinion) {
+        this.opinion = opinion;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("schoolName", getSchoolName())
+            .append("userName", getUserName())
+            .append("userPhone", getUserPhone())
+            .append("isPass", getIsPass())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/RegisterSchoolFile.java

@@ -0,0 +1,106 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 注册-学校-附件对象 register_school_file
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public class RegisterSchoolFile extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 学校ID */
+    @Excel(name = "学校ID")
+    private Long schoolId;
+
+    /** 学校部门id */
+    @Excel(name = "学校部门id")
+    private Long deptId;
+
+    /** 附件名称 */
+    @Excel(name = "附件名称")
+    private String name;
+
+    /** 附件地址 */
+    @Excel(name = "附件地址")
+    private String url;
+
+    /** 地址类型 */
+    @Excel(name = "地址类型")
+    private String type;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSchoolId(Long schoolId) 
+    {
+        this.schoolId = schoolId;
+    }
+
+    public Long getSchoolId() 
+    {
+        return schoolId;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+
+    @Override
+    public String toString() {
+        return "RegisterSchoolFile{" +
+                "id=" + id +
+                ", schoolId=" + schoolId +
+                ", deptId=" + deptId +
+                ", name='" + name + '\'' +
+                ", url='" + url + '\'' +
+                ", type='" + type + '\'' +
+                '}';
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/RegisterTeacher.java

@@ -0,0 +1,165 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 注册-老师对象 register_teacher
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public class RegisterTeacher extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /**微信标识**/
+    private String openId;
+
+    /** 学校id */
+    @Excel(name = "学校id")
+    private Long schoolId;
+
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String userName;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式")
+    private String userPhone;
+
+    /** 审核结果（1：待审核，2：通过，3：不通过） */
+    @Excel(name = "审核结果", readConverterExp = "1=：待审核，2：通过，3：不通过")
+    private String isPass;
+
+    private Long auditId;
+
+    private String auditUser;
+
+    private String opinion;
+
+    private List<RegisterTeacherClass> registerTeacherClassList;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSchoolId(Long schoolId)
+    {
+        this.schoolId = schoolId;
+    }
+
+    public Long getSchoolId()
+    {
+        return schoolId;
+    }
+    public void setSchoolName(String schoolName) 
+    {
+        this.schoolName = schoolName;
+    }
+
+    public String getSchoolName() 
+    {
+        return schoolName;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setUserPhone(String userPhone) 
+    {
+        this.userPhone = userPhone;
+    }
+
+    public String getUserPhone() 
+    {
+        return userPhone;
+    }
+    public void setIsPass(String isPass) 
+    {
+        this.isPass = isPass;
+    }
+
+    public String getIsPass() 
+    {
+        return isPass;
+    }
+
+    public String getOpenId() {
+        return openId;
+    }
+
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    public Long getAuditId() {
+        return auditId;
+    }
+
+    public String getAuditUser() {
+        return auditUser;
+    }
+
+    public String getOpinion() {
+        return opinion;
+    }
+
+    public void setAuditId(Long auditId) {
+        this.auditId = auditId;
+    }
+
+    public void setAuditUser(String auditUser) {
+        this.auditUser = auditUser;
+    }
+
+    public void setOpinion(String opinion) {
+        this.opinion = opinion;
+    }
+
+    public List<RegisterTeacherClass> getRegisterTeacherClassList() {
+        return registerTeacherClassList;
+    }
+
+    public void setRegisterTeacherClassList(List<RegisterTeacherClass> registerTeacherClassList) {
+        this.registerTeacherClassList = registerTeacherClassList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("schoolId", getSchoolId())
+            .append("schoolName", getSchoolName())
+            .append("userName", getUserName())
+            .append("userPhone", getUserPhone())
+            .append("isPass", getIsPass())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/RegisterTeacherClass.java

@@ -0,0 +1,98 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 注册-老师-班级（学科）对象 register_teacher_class
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public class RegisterTeacherClass extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 老师id */
+    @Excel(name = "老师id")
+    private Long teacherId;
+
+    /** 班级id */
+    @Excel(name = "班级id")
+    private Long classId;
+
+    /** 班级名称 */
+    @Excel(name = "班级名称")
+    private String className;
+
+    /** 学科 */
+    @Excel(name = "学科")
+    private String discipline;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTeacherId(Long teacherId)
+    {
+        this.teacherId = teacherId;
+    }
+
+    public Long getTeacherId()
+    {
+        return teacherId;
+    }
+    public void setClassId(Long classId)
+    {
+        this.classId = classId;
+    }
+
+    public Long getClassId()
+    {
+        return classId;
+    }
+    public void setClassName(String className) 
+    {
+        this.className = className;
+    }
+
+    public String getClassName() 
+    {
+        return className;
+    }
+    public void setDiscipline(String discipline) 
+    {
+        this.discipline = discipline;
+    }
+
+    public String getDiscipline() 
+    {
+        return discipline;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("teacherId", getTeacherId())
+            .append("classId", getClassId())
+            .append("className", getClassName())
+            .append("discipline", getDiscipline())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserDept.java

@@ -0,0 +1,50 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 用户和部门关联对象 sys_user_dept
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public class SysUserDept extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("userId", getUserId())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/ZhxyShyj.java

@@ -0,0 +1,143 @@
+package com.ruoyi.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 智慧校园_审核意见对象 zhxy_shyj
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public class ZhxyShyj extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 数据ID */
+    @Excel(name = "数据ID")
+    private Long dataId;
+
+    /** 审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课） */
+    @Excel(name = "审核类型", readConverterExp = "1=：学校注册，2：老师注册，3：家长注册，4：调课")
+    private String type;
+
+    /** 审核人id */
+    @Excel(name = "审核人id")
+    private Long auditId;
+
+    /** 审核人名称 */
+    @Excel(name = "审核人名称")
+    private String auditUser;
+
+    /** 审核结果（是否通过  1：待审核，2：通过 3:不通过) */
+    @Excel(name = "审核结果", readConverterExp = "审核结果（是否通过  1：待审核，2：通过 3:不通过)")
+    private String shjg;
+
+    /** 审核意见 */
+    @Excel(name = "审核意见")
+    private String shyj;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shsj;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDataId(Long dataId) 
+    {
+        this.dataId = dataId;
+    }
+
+    public Long getDataId() 
+    {
+        return dataId;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setAuditId(Long auditId) 
+    {
+        this.auditId = auditId;
+    }
+
+    public Long getAuditId() 
+    {
+        return auditId;
+    }
+    public void setAuditUser(String auditUser) 
+    {
+        this.auditUser = auditUser;
+    }
+
+    public String getAuditUser() 
+    {
+        return auditUser;
+    }
+    public void setShjg(String shjg) 
+    {
+        this.shjg = shjg;
+    }
+
+    public String getShjg() 
+    {
+        return shjg;
+    }
+    public void setShyj(String shyj) 
+    {
+        this.shyj = shyj;
+    }
+
+    public String getShyj() 
+    {
+        return shyj;
+    }
+    public void setShsj(Date shsj) 
+    {
+        this.shsj = shsj;
+    }
+
+    public Date getShsj() 
+    {
+        return shsj;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("dataId", getDataId())
+            .append("type", getType())
+            .append("auditId", getAuditId())
+            .append("auditUser", getAuditUser())
+            .append("shjg", getShjg())
+            .append("shyj", getShyj())
+            .append("shsj", getShsj())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/register.java

@@ -0,0 +1,30 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.RegisterParents;
+import com.ruoyi.system.domain.RegisterSchool;
+import com.ruoyi.system.domain.RegisterTeacher;
+
+public class register {
+
+
+    /**
+     * 雷响（1：学校，2：老师，3：家长）
+     */
+    private String type;
+
+    /**
+     * 学校
+     */
+    private RegisterSchool registerSchool;
+
+    /**
+     * 老师
+     */
+    private RegisterTeacher registerTeacher;
+
+    /**
+     * 家长
+     */
+    private RegisterParents registerParents;
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/FormalParentsStudentMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+
+/**
+ * 家长-学生(审核通过之后数据)Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface FormalParentsStudentMapper 
+{
+    /**
+     * 查询家长-学生(审核通过之后数据)
+     * 
+     * @param id 家长-学生(审核通过之后数据)主键
+     * @return 家长-学生(审核通过之后数据)
+     */
+    public FormalParentsStudent selectFormalParentsStudentById(Long id);
+
+    /**
+     * 查询家长-学生(审核通过之后数据)列表
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 家长-学生(审核通过之后数据)集合
+     */
+    public List<FormalParentsStudent> selectFormalParentsStudentList(FormalParentsStudent formalParentsStudent);
+
+    /**
+     * 新增家长-学生(审核通过之后数据)
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 结果
+     */
+    public int insertFormalParentsStudent(FormalParentsStudent formalParentsStudent);
+
+    /**
+     * 修改家长-学生(审核通过之后数据)
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 结果
+     */
+    public int updateFormalParentsStudent(FormalParentsStudent formalParentsStudent);
+
+    /**
+     * 删除家长-学生(审核通过之后数据)
+     * 
+     * @param id 家长-学生(审核通过之后数据)主键
+     * @return 结果
+     */
+    public int deleteFormalParentsStudentById(Long id);
+
+    /**
+     * 批量删除家长-学生(审核通过之后数据)
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFormalParentsStudentByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/FormalTeacherClassMapper.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
  * 老师-班级（学科）(审核通过之后数据)Mapper接口
  * 
  * @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-30
  */
 public interface FormalTeacherClassMapper 
 {
@@ -60,4 +60,6 @@ public interface FormalTeacherClassMapper
     public int deleteFormalTeacherClassByIds(Long[] ids);
 
     public List<FormalTeacherClass> getTeacherClass(String teacherId);
+
+    void deleteFormalTeacherClassByTeacherId(Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterParentsMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterParents;
+
+/**
+ * 注册-家长Mapper接口
+ * 
+ * @author boman
+ * @date 2023-05-25
+ */
+public interface RegisterParentsMapper 
+{
+    /**
+     * 查询注册-家长
+     * 
+     * @param id 注册-家长主键
+     * @return 注册-家长
+     */
+    public RegisterParents selectRegisterParentsById(Long id);
+
+    /**
+     * 查询注册-家长列表
+     * 
+     * @param registerParents 注册-家长
+     * @return 注册-家长集合
+     */
+    public List<RegisterParents> selectRegisterParentsList(RegisterParents registerParents);
+
+    /**
+     * 新增注册-家长
+     * 
+     * @param registerParents 注册-家长
+     * @return 结果
+     */
+    public int insertRegisterParents(RegisterParents registerParents);
+
+    /**
+     * 修改注册-家长
+     * 
+     * @param registerParents 注册-家长
+     * @return 结果
+     */
+    public int updateRegisterParents(RegisterParents registerParents);
+
+    /**
+     * 删除注册-家长
+     * 
+     * @param id 注册-家长主键
+     * @return 结果
+     */
+    public int deleteRegisterParentsById(Long id);
+
+    /**
+     * 批量删除注册-家长
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRegisterParentsByIds(Long[] ids);
+
+    RegisterParents selectRegisterParentsByOppenId(String oppenId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterParentsStudentMapper.java

@@ -0,0 +1,68 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterParentsStudent;
+
+/**
+ * 注册-家长-学生Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface RegisterParentsStudentMapper 
+{
+    /**
+     * 查询注册-家长-学生
+     * 
+     * @param id 注册-家长-学生主键
+     * @return 注册-家长-学生
+     */
+    public RegisterParentsStudent selectRegisterParentsStudentById(Long id);
+
+    /**
+     * 查询注册-家长-学生列表
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 注册-家长-学生集合
+     */
+    public List<RegisterParentsStudent> selectRegisterParentsStudentList(RegisterParentsStudent registerParentsStudent);
+
+    /**
+     * 新增注册-家长-学生
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 结果
+     */
+    public int insertRegisterParentsStudent(RegisterParentsStudent registerParentsStudent);
+
+    /**
+     * 修改注册-家长-学生
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 结果
+     */
+    public int updateRegisterParentsStudent(RegisterParentsStudent registerParentsStudent);
+
+    /**
+     * 删除注册-家长-学生
+     * 
+     * @param id 注册-家长-学生主键
+     * @return 结果
+     */
+    public int deleteRegisterParentsStudentById(Long id);
+
+    /**
+     * 批量删除注册-家长-学生
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRegisterParentsStudentByIds(Long[] ids);
+    /**
+     * 批量删除注册-家长-学生(只删除审核未通过的)
+     *
+     * @param parentsId 家长id
+     * @return 结果
+     */
+    void deleteRegisterParentsStudentByParentsId(Long parentsId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterSchoolFileMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterSchoolFile;
+
+/**
+ * 注册-学校-附件Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface RegisterSchoolFileMapper 
+{
+    /**
+     * 查询注册-学校-附件
+     * 
+     * @param id 注册-学校-附件主键
+     * @return 注册-学校-附件
+     */
+    public RegisterSchoolFile selectRegisterSchoolFileById(Long id);
+
+    /**
+     * 查询注册-学校-附件列表
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 注册-学校-附件集合
+     */
+    public List<RegisterSchoolFile> selectRegisterSchoolFileList(RegisterSchoolFile registerSchoolFile);
+
+    /**
+     * 新增注册-学校-附件
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 结果
+     */
+    public int insertRegisterSchoolFile(RegisterSchoolFile registerSchoolFile);
+
+    /**
+     * 修改注册-学校-附件
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 结果
+     */
+    public int updateRegisterSchoolFile(RegisterSchoolFile registerSchoolFile);
+
+    /**
+     * 删除注册-学校-附件
+     * 
+     * @param id 注册-学校-附件主键
+     * @return 结果
+     */
+    public int deleteRegisterSchoolFileById(Long id);
+
+    /**
+     * 批量删除注册-学校-附件
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRegisterSchoolFileByIds(Long[] ids);
+
+    void deleteRegisterSchoolFileBySchoolId(Long schoolId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterSchoolMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterSchool;
+
+/**
+ * 注册-学校Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface RegisterSchoolMapper 
+{
+    /**
+     * 查询注册-学校
+     * 
+     * @param id 注册-学校主键
+     * @return 注册-学校
+     */
+    public RegisterSchool selectRegisterSchoolById(Long id);
+
+    /**
+     * 查询注册-学校列表
+     * 
+     * @param registerSchool 注册-学校
+     * @return 注册-学校集合
+     */
+    public List<RegisterSchool> selectRegisterSchoolList(RegisterSchool registerSchool);
+
+    /**
+     * 新增注册-学校
+     * 
+     * @param registerSchool 注册-学校
+     * @return 结果
+     */
+    public int insertRegisterSchool(RegisterSchool registerSchool);
+
+    /**
+     * 修改注册-学校
+     * 
+     * @param registerSchool 注册-学校
+     * @return 结果
+     */
+    public int updateRegisterSchool(RegisterSchool registerSchool);
+
+    /**
+     * 删除注册-学校
+     * 
+     * @param id 注册-学校主键
+     * @return 结果
+     */
+    public int deleteRegisterSchoolById(Long id);
+
+    /**
+     * 批量删除注册-学校
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRegisterSchoolByIds(Long[] ids);
+
+    RegisterSchool selectRegisterSchooByOppenId(String openId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterTeacherClassMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+
+/**
+ * 注册-老师-班级（学科）Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface RegisterTeacherClassMapper 
+{
+    /**
+     * 查询注册-老师-班级（学科）
+     * 
+     * @param id 注册-老师-班级（学科）主键
+     * @return 注册-老师-班级（学科）
+     */
+    public RegisterTeacherClass selectRegisterTeacherClassById(Long id);
+
+    /**
+     * 查询注册-老师-班级（学科）列表
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 注册-老师-班级（学科）集合
+     */
+    public List<RegisterTeacherClass> selectRegisterTeacherClassList(RegisterTeacherClass registerTeacherClass);
+
+    /**
+     * 新增注册-老师-班级（学科）
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 结果
+     */
+    public int insertRegisterTeacherClass(RegisterTeacherClass registerTeacherClass);
+
+    /**
+     * 修改注册-老师-班级（学科）
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 结果
+     */
+    public int updateRegisterTeacherClass(RegisterTeacherClass registerTeacherClass);
+
+    /**
+     * 删除注册-老师-班级（学科）
+     * 
+     * @param id 注册-老师-班级（学科）主键
+     * @return 结果
+     */
+    public int deleteRegisterTeacherClassById(Long id);
+
+    /**
+     * 批量删除注册-老师-班级（学科）
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRegisterTeacherClassByIds(Long[] ids);
+
+    void deleteRegisterTeacherClassByTeacherId(Long teacherId);
+
+    void deleteRegisterTeacherClassByTeacherIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegisterTeacherMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterTeacher;
+
+/**
+ * 注册-老师Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface RegisterTeacherMapper 
+{
+    /**
+     * 查询注册-老师
+     * 
+     * @param id 注册-老师主键
+     * @return 注册-老师
+     */
+    public RegisterTeacher selectRegisterTeacherById(Long id);
+
+    /**
+     * 查询注册-老师列表
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 注册-老师集合
+     */
+    public List<RegisterTeacher> selectRegisterTeacherList(RegisterTeacher registerTeacher);
+
+    /**
+     * 新增注册-老师
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 结果
+     */
+    public int insertRegisterTeacher(RegisterTeacher registerTeacher);
+
+    /**
+     * 修改注册-老师
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 结果
+     */
+    public int updateRegisterTeacher(RegisterTeacher registerTeacher);
+
+    /**
+     * 删除注册-老师
+     * 
+     * @param id 注册-老师主键
+     * @return 结果
+     */
+    public int deleteRegisterTeacherById(Long id);
+
+    /**
+     * 批量删除注册-老师
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRegisterTeacherByIds(Long[] ids);
+
+    RegisterTeacher selectRegisterTeacherByOppenId(String oppenId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -115,4 +115,12 @@ public interface SysDeptMapper
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    SysDept selectDeptByParentId(long parentId);
+
+    void insertDeptList(List<SysDept> sysDeptList);
+
+    void updateDeptIsStatus(Long parentId);
+
+    List<SysDept> selectDeptListChildren(Long parentId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserDeptMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysUserDept;
+
+/**
+ * 用户和部门关联Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface SysUserDeptMapper 
+{
+    /**
+     * 查询用户和部门关联
+     * 
+     * @param userId 用户和部门关联主键
+     * @return 用户和部门关联
+     */
+    public SysUserDept selectSysUserDeptByUserId(Long userId);
+
+    /**
+     * 查询用户和部门关联列表
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 用户和部门关联集合
+     */
+    public List<SysUserDept> selectSysUserDeptList(SysUserDept sysUserDept);
+
+    /**
+     * 新增用户和部门关联
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 结果
+     */
+    public int insertSysUserDept(SysUserDept sysUserDept);
+
+    /**
+     * 修改用户和部门关联
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 结果
+     */
+    public int updateSysUserDept(SysUserDept sysUserDept);
+
+    /**
+     * 删除用户和部门关联
+     * 
+     * @param userId 用户和部门关联主键
+     * @return 结果
+     */
+    public int deleteSysUserDeptByUserId(Long userId);
+
+    /**
+     * 批量删除用户和部门关联
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysUserDeptByUserIds(Long[] userIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -132,4 +132,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    SysUser getByOpenId(String openId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZhxyShyjMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.ZhxyShyj;
+
+/**
+ * 智慧校园_审核意见Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface ZhxyShyjMapper
+{
+    /**
+     * 查询智慧校园_审核意见
+     *
+     * @param id 智慧校园_审核意见主键
+     * @return 智慧校园_审核意见
+     */
+    public ZhxyShyj selectZhxyShyjById(Long id);
+
+    /**
+     * 查询智慧校园_审核意见列表
+     *
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 智慧校园_审核意见集合
+     */
+    public List<ZhxyShyj> selectZhxyShyjList(ZhxyShyj zhxyShyj);
+
+    /**
+     * 新增智慧校园_审核意见
+     *
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 结果
+     */
+    public int insertZhxyShyj(ZhxyShyj zhxyShyj);
+
+    /**
+     * 修改智慧校园_审核意见
+     *
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 结果
+     */
+    public int updateZhxyShyj(ZhxyShyj zhxyShyj);
+
+    /**
+     * 删除智慧校园_审核意见
+     *
+     * @param id 智慧校园_审核意见主键
+     * @return 结果
+     */
+    public int deleteZhxyShyjById(Long id);
+
+    /**
+     * 批量删除智慧校园_审核意见
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZhxyShyjByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IFormalParentsStudentService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+
+/**
+ * 家长-学生(审核通过之后数据)Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface IFormalParentsStudentService 
+{
+    /**
+     * 查询家长-学生(审核通过之后数据)
+     * 
+     * @param id 家长-学生(审核通过之后数据)主键
+     * @return 家长-学生(审核通过之后数据)
+     */
+    public FormalParentsStudent selectFormalParentsStudentById(Long id);
+
+    /**
+     * 查询家长-学生(审核通过之后数据)列表
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 家长-学生(审核通过之后数据)集合
+     */
+    public List<FormalParentsStudent> selectFormalParentsStudentList(FormalParentsStudent formalParentsStudent);
+
+    /**
+     * 新增家长-学生(审核通过之后数据)
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 结果
+     */
+    public int insertFormalParentsStudent(FormalParentsStudent formalParentsStudent);
+
+    /**
+     * 修改家长-学生(审核通过之后数据)
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 结果
+     */
+    public int updateFormalParentsStudent(FormalParentsStudent formalParentsStudent);
+
+    /**
+     * 批量删除家长-学生(审核通过之后数据)
+     * 
+     * @param ids 需要删除的家长-学生(审核通过之后数据)主键集合
+     * @return 结果
+     */
+    public int deleteFormalParentsStudentByIds(Long[] ids);
+
+    /**
+     * 删除家长-学生(审核通过之后数据)信息
+     * 
+     * @param id 家长-学生(审核通过之后数据)主键
+     * @return 结果
+     */
+    public int deleteFormalParentsStudentById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IFormalTeacherClassService.java

@@ -1,13 +1,16 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+import com.ruoyi.common.core.domain.entity.vo.FormalTeacherClassVo;
 
 /**
  * 老师-班级（学科）(审核通过之后数据)Service接口
  * 
  * @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-30
  */
 public interface IFormalTeacherClassService 
 {
@@ -60,4 +63,6 @@ public interface IFormalTeacherClassService
     public int deleteFormalTeacherClassById(Long id);
 
     public List<FormalTeacherClass> getTeacherClass(String teacherId);
+
+    AjaxResult updateFormalTeacherClassList(FormalTeacherClassVo formalTeacherClassVo);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegisterParentsService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.RegisterParents;
+
+/**
+ * 注册-家长Service接口
+ * 
+ * @author boman
+ * @date 2023-05-25
+ */
+public interface IRegisterParentsService 
+{
+    /**
+     * 查询注册-家长
+     * 
+     * @param id 注册-家长主键
+     * @return 注册-家长
+     */
+    public RegisterParents selectRegisterParentsById(Long id);
+
+    /**
+     * 查询注册-家长列表
+     * 
+     * @param registerParents 注册-家长
+     * @return 注册-家长集合
+     */
+    public List<RegisterParents> selectRegisterParentsList(RegisterParents registerParents);
+
+    /**
+     * 新增注册-家长
+     * 
+     * @param registerParents 注册-家长
+     * @return 结果
+     */
+    public AjaxResult insertRegisterParents(RegisterParents registerParents);
+
+    /**
+     * 修改注册-家长
+     * 
+     * @param registerParents 注册-家长
+     * @return 结果
+     */
+    public int updateRegisterParents(RegisterParents registerParents);
+
+    /**
+     * 批量删除注册-家长
+     * 
+     * @param ids 需要删除的注册-家长主键集合
+     * @return 结果
+     */
+    public int deleteRegisterParentsByIds(Long[] ids);
+
+    /**
+     * 删除注册-家长信息
+     * 
+     * @param id 注册-家长主键
+     * @return 结果
+     */
+    public int deleteRegisterParentsById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegisterParentsStudentService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterParentsStudent;
+
+/**
+ * 注册-家长-学生Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface IRegisterParentsStudentService 
+{
+    /**
+     * 查询注册-家长-学生
+     * 
+     * @param id 注册-家长-学生主键
+     * @return 注册-家长-学生
+     */
+    public RegisterParentsStudent selectRegisterParentsStudentById(Long id);
+
+    /**
+     * 查询注册-家长-学生列表
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 注册-家长-学生集合
+     */
+    public List<RegisterParentsStudent> selectRegisterParentsStudentList(RegisterParentsStudent registerParentsStudent);
+
+    /**
+     * 新增注册-家长-学生
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 结果
+     */
+    public int insertRegisterParentsStudent(RegisterParentsStudent registerParentsStudent);
+
+    /**
+     * 修改注册-家长-学生
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 结果
+     */
+    public int updateRegisterParentsStudent(RegisterParentsStudent registerParentsStudent);
+
+    /**
+     * 批量删除注册-家长-学生
+     * 
+     * @param ids 需要删除的注册-家长-学生主键集合
+     * @return 结果
+     */
+    public int deleteRegisterParentsStudentByIds(Long[] ids);
+
+    /**
+     * 删除注册-家长-学生信息
+     * 
+     * @param id 注册-家长-学生主键
+     * @return 结果
+     */
+    public int deleteRegisterParentsStudentById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegisterSchoolFileService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterSchoolFile;
+
+/**
+ * 注册-学校-附件Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface IRegisterSchoolFileService 
+{
+    /**
+     * 查询注册-学校-附件
+     * 
+     * @param id 注册-学校-附件主键
+     * @return 注册-学校-附件
+     */
+    public RegisterSchoolFile selectRegisterSchoolFileById(Long id);
+
+    /**
+     * 查询注册-学校-附件列表
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 注册-学校-附件集合
+     */
+    public List<RegisterSchoolFile> selectRegisterSchoolFileList(RegisterSchoolFile registerSchoolFile);
+
+    /**
+     * 新增注册-学校-附件
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 结果
+     */
+    public int insertRegisterSchoolFile(RegisterSchoolFile registerSchoolFile);
+
+    /**
+     * 修改注册-学校-附件
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 结果
+     */
+    public int updateRegisterSchoolFile(RegisterSchoolFile registerSchoolFile);
+
+    /**
+     * 批量删除注册-学校-附件
+     * 
+     * @param ids 需要删除的注册-学校-附件主键集合
+     * @return 结果
+     */
+    public int deleteRegisterSchoolFileByIds(Long[] ids);
+
+    /**
+     * 删除注册-学校-附件信息
+     * 
+     * @param id 注册-学校-附件主键
+     * @return 结果
+     */
+    public int deleteRegisterSchoolFileById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegisterSchoolService.java

@@ -0,0 +1,65 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.RegisterSchool;
+
+/**
+ * 注册-学校Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface IRegisterSchoolService 
+{
+    /**
+     * 查询注册-学校
+     * 
+     * @param id 注册-学校主键
+     * @return 注册-学校
+     */
+    public RegisterSchool selectRegisterSchoolById(Long id);
+
+    /**
+     * 查询注册-学校列表
+     * 
+     * @param registerSchool 注册-学校
+     * @return 注册-学校集合
+     */
+    public List<RegisterSchool> selectRegisterSchoolList(RegisterSchool registerSchool);
+
+    /**
+     * 新增注册-学校
+     * 
+     * @param registerSchool 注册-学校
+     * @return 结果
+     */
+    public AjaxResult insertRegisterSchool(RegisterSchool registerSchool);
+
+    /**
+     * 修改注册-学校
+     * 
+     * @param registerSchool 注册-学校
+     * @return 结果
+     */
+    public int updateRegisterSchool(RegisterSchool registerSchool);
+
+    /**
+     * 批量删除注册-学校
+     * 
+     * @param ids 需要删除的注册-学校主键集合
+     * @return 结果
+     */
+    public int deleteRegisterSchoolByIds(Long[] ids);
+
+    /**
+     * 删除注册-学校信息
+     * 
+     * @param id 注册-学校主键
+     * @return 结果
+     */
+    public int deleteRegisterSchoolById(Long id);
+
+    AjaxResult queryInfo(String openId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegisterTeacherClassService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+
+/**
+ * 注册-老师-班级（学科）Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface IRegisterTeacherClassService 
+{
+    /**
+     * 查询注册-老师-班级（学科）
+     * 
+     * @param id 注册-老师-班级（学科）主键
+     * @return 注册-老师-班级（学科）
+     */
+    public RegisterTeacherClass selectRegisterTeacherClassById(Long id);
+
+    /**
+     * 查询注册-老师-班级（学科）列表
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 注册-老师-班级（学科）集合
+     */
+    public List<RegisterTeacherClass> selectRegisterTeacherClassList(RegisterTeacherClass registerTeacherClass);
+
+    /**
+     * 新增注册-老师-班级（学科）
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 结果
+     */
+    public int insertRegisterTeacherClass(RegisterTeacherClass registerTeacherClass);
+
+    /**
+     * 修改注册-老师-班级（学科）
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 结果
+     */
+    public int updateRegisterTeacherClass(RegisterTeacherClass registerTeacherClass);
+
+    /**
+     * 批量删除注册-老师-班级（学科）
+     * 
+     * @param ids 需要删除的注册-老师-班级（学科）主键集合
+     * @return 结果
+     */
+    public int deleteRegisterTeacherClassByIds(Long[] ids);
+
+    /**
+     * 删除注册-老师-班级（学科）信息
+     * 
+     * @param id 注册-老师-班级（学科）主键
+     * @return 结果
+     */
+    public int deleteRegisterTeacherClassById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IRegisterTeacherService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.RegisterTeacher;
+
+/**
+ * 注册-老师Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+public interface IRegisterTeacherService 
+{
+    /**
+     * 查询注册-老师
+     * 
+     * @param id 注册-老师主键
+     * @return 注册-老师
+     */
+    public RegisterTeacher selectRegisterTeacherById(Long id);
+
+    /**
+     * 查询注册-老师列表
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 注册-老师集合
+     */
+    public List<RegisterTeacher> selectRegisterTeacherList(RegisterTeacher registerTeacher);
+
+    /**
+     * 新增注册-老师
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 结果
+     */
+    public AjaxResult insertRegisterTeacher(RegisterTeacher registerTeacher);
+
+    /**
+     * 修改注册-老师
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 结果
+     */
+    public int updateRegisterTeacher(RegisterTeacher registerTeacher);
+
+    /**
+     * 批量删除注册-老师
+     * 
+     * @param ids 需要删除的注册-老师主键集合
+     * @return 结果
+     */
+    public int deleteRegisterTeacherByIds(Long[] ids);
+
+    /**
+     * 删除注册-老师信息
+     * 
+     * @param id 注册-老师主键
+     * @return 结果
+     */
+    public int deleteRegisterTeacherById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -1,8 +1,11 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.vo.SysDeptVo;
 
 /**
  * 部门管理 服务层
@@ -121,4 +124,10 @@ public interface ISysDeptService
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    AjaxResult insertDeptList(SysDeptVo sysDeptVo);
+
+    AjaxResult selectDeptSixList(SysDept dept);
+
+    List<SysDept> selectDeptListChildren(Long parentId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserDeptService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.SysUserDept;
+
+/**
+ * 用户和部门关联Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface ISysUserDeptService 
+{
+    /**
+     * 查询用户和部门关联
+     * 
+     * @param userId 用户和部门关联主键
+     * @return 用户和部门关联
+     */
+    public SysUserDept selectSysUserDeptByUserId(Long userId);
+
+    /**
+     * 查询用户和部门关联列表
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 用户和部门关联集合
+     */
+    public List<SysUserDept> selectSysUserDeptList(SysUserDept sysUserDept);
+
+    /**
+     * 新增用户和部门关联
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 结果
+     */
+    public int insertSysUserDept(SysUserDept sysUserDept);
+
+    /**
+     * 修改用户和部门关联
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 结果
+     */
+    public int updateSysUserDept(SysUserDept sysUserDept);
+
+    /**
+     * 批量删除用户和部门关联
+     * 
+     * @param userIds 需要删除的用户和部门关联主键集合
+     * @return 结果
+     */
+    public int deleteSysUserDeptByUserIds(Long[] userIds);
+
+    /**
+     * 删除用户和部门关联信息
+     * 
+     * @param userId 用户和部门关联主键
+     * @return 结果
+     */
+    public int deleteSysUserDeptByUserId(Long userId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -210,4 +210,6 @@ public interface ISysUserService
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    SysUser getByOpenId(String openId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IZhxyShyjService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.ZhxyShyj;
+
+/**
+ * 智慧校园_审核意见Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface IZhxyShyjService 
+{
+    /**
+     * 查询智慧校园_审核意见
+     * 
+     * @param id 智慧校园_审核意见主键
+     * @return 智慧校园_审核意见
+     */
+    public ZhxyShyj selectZhxyShyjById(Long id);
+
+    /**
+     * 查询智慧校园_审核意见列表
+     * 
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 智慧校园_审核意见集合
+     */
+    public List<ZhxyShyj> selectZhxyShyjList(ZhxyShyj zhxyShyj);
+
+    /**
+     * 新增智慧校园_审核意见
+     * 
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 结果
+     */
+    public int insertZhxyShyj(ZhxyShyj zhxyShyj);
+
+    /**
+     * 修改智慧校园_审核意见
+     * 
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 结果
+     */
+    public int updateZhxyShyj(ZhxyShyj zhxyShyj);
+
+    /**
+     * 批量删除智慧校园_审核意见
+     * 
+     * @param ids 需要删除的智慧校园_审核意见主键集合
+     * @return 结果
+     */
+    public int deleteZhxyShyjByIds(Long[] ids);
+
+    /**
+     * 删除智慧校园_审核意见信息
+     * 
+     * @param id 智慧校园_审核意见主键
+     * @return 结果
+     */
+    public int deleteZhxyShyjById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletServiceImpl.java

@@ -1,18 +1,14 @@
 package com.ruoyi.system.service.impl;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.service.IAppletService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.text.SimpleDateFormat;
 import java.util.*;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FormalParentsStudentServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.FormalParentsStudentMapper;
+import com.ruoyi.system.service.IFormalParentsStudentService;
+
+/**
+ * 家长-学生(审核通过之后数据)Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@Service
+public class FormalParentsStudentServiceImpl implements IFormalParentsStudentService 
+{
+    @Autowired
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+
+    /**
+     * 查询家长-学生(审核通过之后数据)
+     * 
+     * @param id 家长-学生(审核通过之后数据)主键
+     * @return 家长-学生(审核通过之后数据)
+     */
+    @Override
+    public FormalParentsStudent selectFormalParentsStudentById(Long id)
+    {
+        return formalParentsStudentMapper.selectFormalParentsStudentById(id);
+    }
+
+    /**
+     * 查询家长-学生(审核通过之后数据)列表
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 家长-学生(审核通过之后数据)
+     */
+    @Override
+    public List<FormalParentsStudent> selectFormalParentsStudentList(FormalParentsStudent formalParentsStudent)
+    {
+        return formalParentsStudentMapper.selectFormalParentsStudentList(formalParentsStudent);
+    }
+
+    /**
+     * 新增家长-学生(审核通过之后数据)
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 结果
+     */
+    @Override
+    public int insertFormalParentsStudent(FormalParentsStudent formalParentsStudent)
+    {
+        formalParentsStudent.setCreateTime(DateUtils.getNowDate());
+        return formalParentsStudentMapper.insertFormalParentsStudent(formalParentsStudent);
+    }
+
+    /**
+     * 修改家长-学生(审核通过之后数据)
+     * 
+     * @param formalParentsStudent 家长-学生(审核通过之后数据)
+     * @return 结果
+     */
+    @Override
+    public int updateFormalParentsStudent(FormalParentsStudent formalParentsStudent)
+    {
+        formalParentsStudent.setUpdateTime(DateUtils.getNowDate());
+        return formalParentsStudentMapper.updateFormalParentsStudent(formalParentsStudent);
+    }
+
+    /**
+     * 批量删除家长-学生(审核通过之后数据)
+     * 
+     * @param ids 需要删除的家长-学生(审核通过之后数据)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFormalParentsStudentByIds(Long[] ids)
+    {
+        return formalParentsStudentMapper.deleteFormalParentsStudentByIds(ids);
+    }
+
+    /**
+     * 删除家长-学生(审核通过之后数据)信息
+     * 
+     * @param id 家长-学生(审核通过之后数据)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFormalParentsStudentById(Long id)
+    {
+        return formalParentsStudentMapper.deleteFormalParentsStudentById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FormalTeacherClassServiceImpl.java

@@ -1,9 +1,13 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.entity.vo.FormalTeacherClassVo;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.XiakeConfig;
-import com.ruoyi.system.mapper.XiakeConfigMapper;
+import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.FormalTeacherClassMapper;
@@ -14,15 +18,13 @@ import com.ruoyi.system.service.IFormalTeacherClassService;
  * 老师-班级（学科）(审核通过之后数据)Service业务层处理
  * 
  * @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-30
  */
 @Service
 public class FormalTeacherClassServiceImpl implements IFormalTeacherClassService 
 {
     @Autowired
     private FormalTeacherClassMapper formalTeacherClassMapper;
-    @Autowired
-    private XiakeConfigMapper xiakeConfigMapper;
 
     /**
      * 查询老师-班级（学科）(审核通过之后数据)
@@ -57,18 +59,10 @@ public class FormalTeacherClassServiceImpl implements IFormalTeacherClassService
     @Override
     public int insertFormalTeacherClass(FormalTeacherClass formalTeacherClass)
     {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        formalTeacherClass.setTeacherId(user.getUserId());
+        formalTeacherClass.setTeacherName(user.getNickName());
         formalTeacherClass.setCreateTime(DateUtils.getNowDate());
-        //需要新增两个班级下课时间和延迟下课的默认值/
-        XiakeConfig xiakeConfig = new XiakeConfig();
-        xiakeConfig.setConfigKey(formalTeacherClass.getClassId() + ":1");
-        xiakeConfig.setConfigValue("5");
-        xiakeConfig.setConfigType("1");
-        xiakeConfigMapper.insertConfig(xiakeConfig);
-        XiakeConfig xiakeConfig2 = new XiakeConfig();
-        xiakeConfig2.setConfigKey(formalTeacherClass.getClassId() + ":2");
-        xiakeConfig2.setConfigValue("5");
-        xiakeConfig2.setConfigType("2");
-        xiakeConfigMapper.insertConfig(xiakeConfig2);
         return formalTeacherClassMapper.insertFormalTeacherClass(formalTeacherClass);
     }
 
@@ -113,4 +107,24 @@ public class FormalTeacherClassServiceImpl implements IFormalTeacherClassService
     public List<FormalTeacherClass> getTeacherClass(String teacherId) {
         return formalTeacherClassMapper.getTeacherClass(teacherId);
     }
+
+    @Override
+    public AjaxResult updateFormalTeacherClassList(FormalTeacherClassVo formalTeacherClassVo) {
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<FormalTeacherClass> pormalTeacherClassList = formalTeacherClassVo.getPormalTeacherClassList();
+        if(pormalTeacherClassList==null || pormalTeacherClassList.size()<=0){
+            return AjaxResult.error("参数错误");
+        }
+        //先删除
+        formalTeacherClassMapper.deleteFormalTeacherClassByTeacherId(user.getUserId());
+        for (FormalTeacherClass formalTeacherClass : pormalTeacherClassList) {
+            formalTeacherClass.setTeacherId(user.getUserId());
+            formalTeacherClass.setTeacherName(user.getNickName());
+            formalTeacherClass.setUpdateTime(DateUtils.getNowDate());
+            formalTeacherClass.setCreateTime(DateUtils.getNowDate());
+            formalTeacherClassMapper.insertFormalTeacherClass(formalTeacherClass);
+        }
+        return AjaxResult.success();
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterParentsServiceImpl.java

@@ -0,0 +1,153 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.RegisterParentsStudent;
+import com.ruoyi.system.domain.RegisterSchool;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+import com.ruoyi.system.mapper.FormalParentsStudentMapper;
+import com.ruoyi.system.mapper.RegisterParentsStudentMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RegisterParentsMapper;
+import com.ruoyi.system.domain.RegisterParents;
+import com.ruoyi.system.service.IRegisterParentsService;
+
+/**
+ * 注册-家长Service业务层处理
+ * 
+ * @author boman
+ * @date 2023-05-25
+ */
+@Service
+public class RegisterParentsServiceImpl implements IRegisterParentsService 
+{
+    @Autowired
+    private RegisterParentsMapper registerParentsMapper;
+
+    @Autowired
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+
+    /**
+     * 查询注册-家长
+     * 
+     * @param id 注册-家长主键
+     * @return 注册-家长
+     */
+    @Override
+    public RegisterParents selectRegisterParentsById(Long id)
+    {
+        return registerParentsMapper.selectRegisterParentsById(id);
+    }
+
+    /**
+     * 查询注册-家长列表
+     * 
+     * @param registerParents 注册-家长
+     * @return 注册-家长
+     */
+    @Override
+    public List<RegisterParents> selectRegisterParentsList(RegisterParents registerParents)
+    {
+        return registerParentsMapper.selectRegisterParentsList(registerParents);
+    }
+
+    /**
+     * 新增注册-家长
+     * 
+     * @param registerParents 注册-家长
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertRegisterParents(RegisterParents registerParents)
+    {
+
+        //查询是否已经注册过
+        RegisterParents registerParentsOld = registerParentsMapper.selectRegisterParentsByOppenId(registerParents.getOpenId());
+        if(registerParentsOld!=null){
+            if(registerParentsOld.getIsPass().equals("1")){
+                return AjaxResult.error("该微信已注册当前身份，信息正在审核中。",registerParentsOld);
+            }else if(registerParentsOld.getIsPass().equals("2")){
+                return AjaxResult.error("该微信已注册当前身份，审核已通过，请登录。",registerParentsOld);
+            }else{
+                return AjaxResult.error("该微信已注册当前身份，审核未通过。",registerParentsOld);
+            }
+        }
+        registerParents.setCreateTime(DateUtils.getNowDate());
+        registerParents.setUpdateTime(DateUtils.getNowDate());
+        int count = registerParentsMapper.insertRegisterParents(registerParents);
+
+        List<RegisterParentsStudent> registerParentsStudentList = registerParents.getRegisterParentsStudentList();
+        if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){
+            for (RegisterParentsStudent registerParentsStudent : registerParentsStudentList) {
+                registerParentsStudent.setParentsId(registerParents.getId());
+                registerParentsStudent.setParentsName(registerParents.getUserName());
+                registerParentsStudent.setParentsPhone(registerParents.getUserPhone());
+                registerParentsStudent.setCreateTime(DateUtils.getNowDate());
+                registerParentsStudent.setUpdateTime(DateUtils.getNowDate());
+                registerParentsStudentMapper.insertRegisterParentsStudent(registerParentsStudent);
+            }
+        }
+
+
+        return count > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改注册-家长
+     * 
+     * @param registerParents 注册-家长
+     * @return 结果
+     */
+    @Override
+    public int updateRegisterParents(RegisterParents registerParents)
+    {
+        //先删除审核未通过的数据
+        List<RegisterParentsStudent> registerParentsStudentList = registerParents.getRegisterParentsStudentList();
+        if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){
+            registerParentsStudentMapper.deleteRegisterParentsStudentByParentsId(registerParents.getId());
+            for (RegisterParentsStudent registerParentsStudent : registerParentsStudentList) {
+                if("3".equals(registerParentsStudent.getIsPass()) || StringUtils.isEmpty(registerParentsStudent.getIsPass())){
+                    registerParentsStudent.setParentsId(registerParents.getId());
+                    registerParentsStudent.setParentsName(registerParents.getUserName());
+                    registerParentsStudent.setParentsPhone(registerParents.getUserPhone());
+                    registerParentsStudent.setIsPass("1");
+                    registerParentsStudent.setCreateTime(DateUtils.getNowDate());
+                    registerParentsStudent.setUpdateTime(DateUtils.getNowDate());
+                    registerParentsStudentMapper.insertRegisterParentsStudent(registerParentsStudent);
+                }
+            }
+        }
+        registerParents.setIsPass("1");
+        registerParents.setUpdateTime(DateUtils.getNowDate());
+        return registerParentsMapper.updateRegisterParents(registerParents);
+    }
+
+    /**
+     * 批量删除注册-家长
+     * 
+     * @param ids 需要删除的注册-家长主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterParentsByIds(Long[] ids)
+    {
+        return registerParentsMapper.deleteRegisterParentsByIds(ids);
+    }
+
+    /**
+     * 删除注册-家长信息
+     * 
+     * @param id 注册-家长主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterParentsById(Long id)
+    {
+        return registerParentsMapper.deleteRegisterParentsById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterParentsStudentServiceImpl.java

@@ -0,0 +1,130 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+import com.ruoyi.system.mapper.FormalTeacherClassMapper;
+import com.ruoyi.system.service.IRegisterTeacherClassService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RegisterParentsStudentMapper;
+import com.ruoyi.system.domain.RegisterParentsStudent;
+import com.ruoyi.system.service.IRegisterParentsStudentService;
+
+/**
+ * 注册-家长-学生Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Service
+public class RegisterParentsStudentServiceImpl implements IRegisterParentsStudentService 
+{
+    @Autowired
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+    @Autowired
+    private IRegisterTeacherClassService registerTeacherClassService;
+    @Autowired
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+
+    /**
+     * 查询注册-家长-学生
+     * 
+     * @param id 注册-家长-学生主键
+     * @return 注册-家长-学生
+     */
+    @Override
+    public RegisterParentsStudent selectRegisterParentsStudentById(Long id)
+    {
+        return registerParentsStudentMapper.selectRegisterParentsStudentById(id);
+    }
+
+    /**
+     * 查询注册-家长-学生列表
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 注册-家长-学生
+     */
+    @Override
+    public List<RegisterParentsStudent> selectRegisterParentsStudentList(RegisterParentsStudent registerParentsStudent)
+    {
+
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<SysRole> roles = user.getRoles();
+        boolean bl = false;
+        for (SysRole role : roles) {
+            if("teacher".equals(role.getRoleKey())){
+                bl = true;
+                break;
+            }
+        }
+        //角色是老师
+        if(bl){
+            //查询老师班级
+            FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+            formalTeacherClass.setTeacherId(user.getUserId());
+            List<FormalTeacherClass> formalTeacherClassList = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+            List<Long> classIds = formalTeacherClassList.stream().map(FormalTeacherClass::getClassId).collect(Collectors.toList());
+            registerParentsStudent.setClassIds(classIds);
+        }
+
+        return registerParentsStudentMapper.selectRegisterParentsStudentList(registerParentsStudent);
+    }
+
+    /**
+     * 新增注册-家长-学生
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 结果
+     */
+    @Override
+    public int insertRegisterParentsStudent(RegisterParentsStudent registerParentsStudent)
+    {
+        registerParentsStudent.setCreateTime(DateUtils.getNowDate());
+        return registerParentsStudentMapper.insertRegisterParentsStudent(registerParentsStudent);
+    }
+
+    /**
+     * 修改注册-家长-学生
+     * 
+     * @param registerParentsStudent 注册-家长-学生
+     * @return 结果
+     */
+    @Override
+    public int updateRegisterParentsStudent(RegisterParentsStudent registerParentsStudent)
+    {
+        registerParentsStudent.setUpdateTime(DateUtils.getNowDate());
+        return registerParentsStudentMapper.updateRegisterParentsStudent(registerParentsStudent);
+    }
+
+    /**
+     * 批量删除注册-家长-学生
+     * 
+     * @param ids 需要删除的注册-家长-学生主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterParentsStudentByIds(Long[] ids)
+    {
+        return registerParentsStudentMapper.deleteRegisterParentsStudentByIds(ids);
+    }
+
+    /**
+     * 删除注册-家长-学生信息
+     * 
+     * @param id 注册-家长-学生主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterParentsStudentById(Long id)
+    {
+        return registerParentsStudentMapper.deleteRegisterParentsStudentById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterSchoolFileServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RegisterSchoolFileMapper;
+import com.ruoyi.system.domain.RegisterSchoolFile;
+import com.ruoyi.system.service.IRegisterSchoolFileService;
+
+/**
+ * 注册-学校-附件Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+@Service
+public class RegisterSchoolFileServiceImpl implements IRegisterSchoolFileService 
+{
+    @Autowired
+    private RegisterSchoolFileMapper registerSchoolFileMapper;
+
+    /**
+     * 查询注册-学校-附件
+     * 
+     * @param id 注册-学校-附件主键
+     * @return 注册-学校-附件
+     */
+    @Override
+    public RegisterSchoolFile selectRegisterSchoolFileById(Long id)
+    {
+        return registerSchoolFileMapper.selectRegisterSchoolFileById(id);
+    }
+
+    /**
+     * 查询注册-学校-附件列表
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 注册-学校-附件
+     */
+    @Override
+    public List<RegisterSchoolFile> selectRegisterSchoolFileList(RegisterSchoolFile registerSchoolFile)
+    {
+        return registerSchoolFileMapper.selectRegisterSchoolFileList(registerSchoolFile);
+    }
+
+    /**
+     * 新增注册-学校-附件
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 结果
+     */
+    @Override
+    public int insertRegisterSchoolFile(RegisterSchoolFile registerSchoolFile)
+    {
+        return registerSchoolFileMapper.insertRegisterSchoolFile(registerSchoolFile);
+    }
+
+    /**
+     * 修改注册-学校-附件
+     * 
+     * @param registerSchoolFile 注册-学校-附件
+     * @return 结果
+     */
+    @Override
+    public int updateRegisterSchoolFile(RegisterSchoolFile registerSchoolFile)
+    {
+        return registerSchoolFileMapper.updateRegisterSchoolFile(registerSchoolFile);
+    }
+
+    /**
+     * 批量删除注册-学校-附件
+     * 
+     * @param ids 需要删除的注册-学校-附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterSchoolFileByIds(Long[] ids)
+    {
+        return registerSchoolFileMapper.deleteRegisterSchoolFileByIds(ids);
+    }
+
+    /**
+     * 删除注册-学校-附件信息
+     * 
+     * @param id 注册-学校-附件主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterSchoolFileById(Long id)
+    {
+        return registerSchoolFileMapper.deleteRegisterSchoolFileById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterSchoolServiceImpl.java

@@ -0,0 +1,186 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.RegisterParents;
+import com.ruoyi.system.domain.RegisterSchoolFile;
+import com.ruoyi.system.domain.RegisterTeacher;
+import com.ruoyi.system.mapper.RegisterParentsMapper;
+import com.ruoyi.system.mapper.RegisterSchoolFileMapper;
+import com.ruoyi.system.mapper.RegisterTeacherMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RegisterSchoolMapper;
+import com.ruoyi.system.domain.RegisterSchool;
+import com.ruoyi.system.service.IRegisterSchoolService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 注册-学校Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+@Service
+public class RegisterSchoolServiceImpl implements IRegisterSchoolService 
+{
+    @Autowired
+    private RegisterSchoolMapper registerSchoolMapper;
+    @Autowired
+    private RegisterSchoolFileMapper registerSchoolFileMapper;
+    @Autowired
+    private RegisterTeacherMapper registerTeacherMapper;
+    @Autowired
+    private RegisterParentsMapper registerParentsMapper;
+
+    /**
+     * 查询注册-学校
+     * 
+     * @param id 注册-学校主键
+     * @return 注册-学校
+     */
+    @Override
+    public RegisterSchool selectRegisterSchoolById(Long id)
+    {
+        RegisterSchool registerSchool = registerSchoolMapper.selectRegisterSchoolById(id);
+        RegisterSchoolFile registerSchoolFile = new RegisterSchoolFile();
+        registerSchoolFile.setSchoolId(id);
+        List<RegisterSchoolFile> registerSchoolFileList = registerSchoolFileMapper.selectRegisterSchoolFileList(registerSchoolFile);
+        registerSchool.setRegisterSchoolFileList(registerSchoolFileList);
+
+        return registerSchool;
+    }
+
+    /**
+     * 查询注册-学校列表
+     * 
+     * @param registerSchool 注册-学校
+     * @return 注册-学校
+     */
+    @Override
+    public List<RegisterSchool> selectRegisterSchoolList(RegisterSchool registerSchool)
+    {
+        List<RegisterSchool> registerSchoolList = registerSchoolMapper.selectRegisterSchoolList(registerSchool);
+        if(registerSchoolList!=null && registerSchoolList.size()>0){
+            for (RegisterSchool school : registerSchoolList) {
+                RegisterSchoolFile registerSchoolFile = new RegisterSchoolFile();
+                registerSchoolFile.setSchoolId(school.getId());
+                List<RegisterSchoolFile> registerSchoolFileList = registerSchoolFileMapper.selectRegisterSchoolFileList(registerSchoolFile);
+                school.setRegisterSchoolFileList(registerSchoolFileList);
+            }
+        }
+        //List<Long> ids = registerSchoolList.stream().map(RegisterSchool::getId).collect(Collectors.toList());
+        //List<RegisterSchoolFile> registerSchoolFile = registerSchoolFileMapper
+        return registerSchoolList;
+    }
+
+    /**
+     * 新增注册-学校
+     * 
+     * @param registerSchool 注册-学校
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult insertRegisterSchool(RegisterSchool registerSchool)
+    {
+        //查询是否已经注册过
+        RegisterSchool registerSchoolOld = registerSchoolMapper.selectRegisterSchooByOppenId(registerSchool.getOpenId());
+        if(registerSchoolOld!=null){
+            if(registerSchoolOld.getIsPass().equals("1")){
+                return AjaxResult.error("该微信已注册当前身份，信息正在审核中。",registerSchoolOld);
+            }else if(registerSchoolOld.getIsPass().equals("2")){
+                return AjaxResult.error("该微信已注册当前身份，审核已通过，请登录。",registerSchoolOld);
+            }else{
+                return AjaxResult.error("该微信已注册当前身份，审核未通过。",registerSchoolOld);
+            }
+        }
+        registerSchool.setCreateTime(DateUtils.getNowDate());
+        registerSchool.setUpdateTime(DateUtils.getNowDate());
+        registerSchool.setIsPass("1");
+        int count = registerSchoolMapper.insertRegisterSchool(registerSchool);
+        if(registerSchool.getRegisterSchoolFileList()!=null && registerSchool.getRegisterSchoolFileList().size()>0){
+            List<RegisterSchoolFile> registerSchoolFile = registerSchool.getRegisterSchoolFileList();
+            for (RegisterSchoolFile schoolFile : registerSchoolFile) {
+                schoolFile.setSchoolId(registerSchool.getId());
+                registerSchoolFileMapper.insertRegisterSchoolFile(schoolFile);
+            }
+        }
+        return count > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改注册-学校
+     * 
+     * @param registerSchool 注册-学校
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateRegisterSchool(RegisterSchool registerSchool)
+    {
+        registerSchool.setIsPass("1");
+        registerSchool.setUpdateTime(DateUtils.getNowDate());
+        //先删除附件
+        if(registerSchool.getRegisterSchoolFileList()!=null && registerSchool.getRegisterSchoolFileList().size()>0){
+            registerSchoolFileMapper.deleteRegisterSchoolFileBySchoolId(registerSchool.getId());
+            List<RegisterSchoolFile> registerSchoolFile = registerSchool.getRegisterSchoolFileList();
+            for (RegisterSchoolFile schoolFile : registerSchoolFile) {
+                schoolFile.setSchoolId(registerSchool.getId());
+                registerSchoolFileMapper.insertRegisterSchoolFile(schoolFile);
+            }
+        }
+
+        return registerSchoolMapper.updateRegisterSchool(registerSchool);
+    }
+
+    /**
+     * 批量删除注册-学校
+     * 
+     * @param ids 需要删除的注册-学校主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterSchoolByIds(Long[] ids)
+    {
+        return registerSchoolMapper.deleteRegisterSchoolByIds(ids);
+    }
+
+    /**
+     * 删除注册-学校信息
+     * 
+     * @param id 注册-学校主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterSchoolById(Long id)
+    {
+        return registerSchoolMapper.deleteRegisterSchoolById(id);
+    }
+
+    @Override
+    public AjaxResult queryInfo(String openId) {
+        if(StringUtils.isEmpty(openId)){
+            throw new ServiceException("参数获取异常，请稍后重试");
+        }
+        Map<String,Object> map = new HashMap<>();
+        //查询学校里是否有注册信息
+        RegisterSchool registerSchoolOld = registerSchoolMapper.selectRegisterSchooByOppenId(openId);
+        map.put("school",registerSchoolOld);
+        //查询老师是否有注册信息
+        RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherByOppenId(openId);
+        map.put("teacher",registerTeacher);
+        //查询家长注册信息
+        RegisterParents registerParents = registerParentsMapper.selectRegisterParentsByOppenId(openId);
+        map.put("parents",registerParents);
+        return AjaxResult.success(map);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterTeacherClassServiceImpl.java

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RegisterTeacherClassMapper;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+import com.ruoyi.system.service.IRegisterTeacherClassService;
+
+/**
+ * 注册-老师-班级（学科）Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Service
+public class RegisterTeacherClassServiceImpl implements IRegisterTeacherClassService 
+{
+    @Autowired
+    private RegisterTeacherClassMapper registerTeacherClassMapper;
+
+    /**
+     * 查询注册-老师-班级（学科）
+     * 
+     * @param id 注册-老师-班级（学科）主键
+     * @return 注册-老师-班级（学科）
+     */
+    @Override
+    public RegisterTeacherClass selectRegisterTeacherClassById(Long id)
+    {
+        return registerTeacherClassMapper.selectRegisterTeacherClassById(id);
+    }
+
+    /**
+     * 查询注册-老师-班级（学科）列表
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 注册-老师-班级（学科）
+     */
+    @Override
+    public List<RegisterTeacherClass> selectRegisterTeacherClassList(RegisterTeacherClass registerTeacherClass)
+    {
+        return registerTeacherClassMapper.selectRegisterTeacherClassList(registerTeacherClass);
+    }
+
+    /**
+     * 新增注册-老师-班级（学科）
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 结果
+     */
+    @Override
+    public int insertRegisterTeacherClass(RegisterTeacherClass registerTeacherClass)
+    {
+        registerTeacherClass.setCreateTime(DateUtils.getNowDate());
+        return registerTeacherClassMapper.insertRegisterTeacherClass(registerTeacherClass);
+    }
+
+    /**
+     * 修改注册-老师-班级（学科）
+     * 
+     * @param registerTeacherClass 注册-老师-班级（学科）
+     * @return 结果
+     */
+    @Override
+    public int updateRegisterTeacherClass(RegisterTeacherClass registerTeacherClass)
+    {
+        registerTeacherClass.setUpdateTime(DateUtils.getNowDate());
+        return registerTeacherClassMapper.updateRegisterTeacherClass(registerTeacherClass);
+    }
+
+    /**
+     * 批量删除注册-老师-班级（学科）
+     * 
+     * @param ids 需要删除的注册-老师-班级（学科）主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterTeacherClassByIds(Long[] ids)
+    {
+        return registerTeacherClassMapper.deleteRegisterTeacherClassByIds(ids);
+    }
+
+    /**
+     * 删除注册-老师-班级（学科）信息
+     * 
+     * @param id 注册-老师-班级（学科）主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRegisterTeacherClassById(Long id)
+    {
+        return registerTeacherClassMapper.deleteRegisterTeacherClassById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegisterTeacherServiceImpl.java

@@ -0,0 +1,159 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.RegisterSchool;
+import com.ruoyi.system.domain.RegisterSchoolFile;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+import com.ruoyi.system.mapper.RegisterTeacherClassMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.RegisterTeacherMapper;
+import com.ruoyi.system.domain.RegisterTeacher;
+import com.ruoyi.system.service.IRegisterTeacherService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 注册-老师Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-25
+ */
+@Service
+public class RegisterTeacherServiceImpl implements IRegisterTeacherService 
+{
+    @Autowired
+    private RegisterTeacherMapper registerTeacherMapper;
+    @Autowired
+    private RegisterTeacherClassMapper registerTeacherClassMapper;
+
+    /**
+     * 查询注册-老师
+     * 
+     * @param id 注册-老师主键
+     * @return 注册-老师
+     */
+    @Override
+    public RegisterTeacher selectRegisterTeacherById(Long id)
+    {
+
+        RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherById(id);
+        RegisterTeacherClass registerTeacherClass = new RegisterTeacherClass();
+        registerTeacherClass.setTeacherId(id);
+        List<RegisterTeacherClass> registerTeacherClassList = registerTeacherClassMapper.selectRegisterTeacherClassList(registerTeacherClass);
+        registerTeacher.setRegisterTeacherClassList(registerTeacherClassList);
+        return registerTeacher;
+    }
+
+    /**
+     * 查询注册-老师列表
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 注册-老师
+     */
+    @Override
+    public List<RegisterTeacher> selectRegisterTeacherList(RegisterTeacher registerTeacher)
+    {
+
+        List<RegisterTeacher> registerTeacherList = registerTeacherMapper.selectRegisterTeacherList(registerTeacher);
+        if(registerTeacherList!=null && registerTeacherList.size()>0){
+            for (RegisterTeacher teacher : registerTeacherList) {
+                RegisterTeacherClass registerTeacherClass = new RegisterTeacherClass();
+                registerTeacherClass.setTeacherId(teacher.getId());
+                List<RegisterTeacherClass> registerTeacherClassList = registerTeacherClassMapper.selectRegisterTeacherClassList(registerTeacherClass);
+                teacher.setRegisterTeacherClassList(registerTeacherClassList);
+            }
+        }
+        return registerTeacherList;
+    }
+
+    /**
+     * 新增注册-老师
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult insertRegisterTeacher(RegisterTeacher registerTeacher)
+    {
+        //查询是否已经注册过
+        RegisterTeacher registerTeacherOld = registerTeacherMapper.selectRegisterTeacherByOppenId(registerTeacher.getOpenId());
+        if(registerTeacherOld!=null){
+            if(registerTeacherOld.getIsPass().equals("1")){
+                return AjaxResult.error("该微信已注册当前身份，信息正在审核中。",registerTeacherOld);
+            }else if(registerTeacherOld.getIsPass().equals("2")){
+                return AjaxResult.error("该微信已注册当前身份，审核已通过，请登录。",registerTeacherOld);
+            }else{
+                return AjaxResult.error("该微信已注册当前身份，审核未通过。",registerTeacherOld);
+            }
+        }
+        registerTeacher.setCreateTime(DateUtils.getNowDate());
+        registerTeacher.setUpdateTime(DateUtils.getNowDate());
+        int rows = registerTeacherMapper.insertRegisterTeacher(registerTeacher);
+
+        List<RegisterTeacherClass> registerTeacherClassList = registerTeacher.getRegisterTeacherClassList();
+        if(registerTeacherClassList!=null && registerTeacherClassList.size()>0){
+            for (RegisterTeacherClass registerTeacherClass : registerTeacherClassList) {
+                registerTeacherClass.setTeacherId(registerTeacher.getId());
+                registerTeacherClassMapper.insertRegisterTeacherClass(registerTeacherClass);
+
+            }
+        }
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改注册-老师
+     * 
+     * @param registerTeacher 注册-老师
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateRegisterTeacher(RegisterTeacher registerTeacher)
+    {
+        //删除注册表-老师-班级（学科）表
+        List<RegisterTeacherClass> registerTeacherClassList = registerTeacher.getRegisterTeacherClassList();
+        if(registerTeacherClassList!=null && registerTeacherClassList.size()>0){
+            registerTeacherClassMapper.deleteRegisterTeacherClassByTeacherId(registerTeacher.getId());
+            for (RegisterTeacherClass registerTeacherClass : registerTeacherClassList) {
+                registerTeacherClass.setTeacherId(registerTeacher.getId());
+                registerTeacherClassMapper.insertRegisterTeacherClass(registerTeacherClass);
+            }
+        }
+        registerTeacher.setIsPass("1");
+        registerTeacher.setUpdateTime(DateUtils.getNowDate());
+        return registerTeacherMapper.updateRegisterTeacher(registerTeacher);
+    }
+
+    /**
+     * 批量删除注册-老师
+     * 
+     * @param ids 需要删除的注册-老师主键
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteRegisterTeacherByIds(Long[] ids)
+    {
+        registerTeacherClassMapper.deleteRegisterTeacherClassByTeacherIds(ids);
+        return registerTeacherMapper.deleteRegisterTeacherByIds(ids);
+    }
+
+    /**
+     * 删除注册-老师信息
+     * 
+     * @param id 注册-老师主键
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteRegisterTeacherById(Long id)
+    {
+        registerTeacherClassMapper.deleteRegisterTeacherClassByTeacherId(id);
+        return registerTeacherMapper.deleteRegisterTeacherById(id);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -1,9 +1,10 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.vo.SysDeptVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
@@ -211,13 +212,19 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public int insertDept(SysDept dept)
     {
+
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
-        // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
-        {
-            throw new ServiceException("部门停用，不允许新增");
+        if(info!=null){
+            // 如果父节点不为正常状态,则不允许新增子节点
+            if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+            {
+                throw new ServiceException("部门停用，不允许新增");
+            }
+            dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+        }else{
+            dept.setAncestors(String.valueOf(dept.getParentId()));
         }
-        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+
         return deptMapper.insertDept(dept);
     }
 
@@ -293,6 +300,73 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.deleteDeptById(deptId);
     }
 
+    @Override
+    public AjaxResult insertDeptList(SysDeptVo sysDeptVo) {
+
+        List<SysDept>  sysDeptList = sysDeptVo.getSysDeptList();
+        if(sysDeptList==null || sysDeptList.size()<=0){
+            return AjaxResult.error("参数不能为空");
+        }
+        //将当前学校的班级部门千不改为禁用
+        deptMapper.updateDeptIsStatus(sysDeptList.get(0).getParentId());
+        List<Long> deptIds = new ArrayList<>();
+        int num = 0;
+
+        for (SysDept sysDept : sysDeptList) {
+            if("N".equals(sysDept.getIsAdd())){
+                deptIds.add(sysDept.getDeptId());
+                num = sysDept.getOrderNum();
+            }else{
+                //新增
+                sysDept.setOrderNum(num+1);
+                deptMapper.insertDept(sysDept);
+            }
+        }
+        Long[] skuIds = deptIds.toArray(new Long[deptIds.size()]);
+        deptMapper.updateDeptStatusNormal(skuIds);
+        return AjaxResult.success("操作成功");
+    }
+
+    @Override
+    public AjaxResult selectDeptSixList(SysDept dept) {
+
+        Map<String,Object> map = new HashMap<>();
+        List<SysDept> sysDeptList = deptMapper.selectDeptList(dept);
+        List<SysDept> sysDeptList1 = new ArrayList<>();
+        List<SysDept> sysDeptList2 = new ArrayList<>();
+        List<SysDept> sysDeptList3 = new ArrayList<>();
+        List<SysDept> sysDeptList4 = new ArrayList<>();
+        List<SysDept> sysDeptList5 = new ArrayList<>();
+        List<SysDept> sysDeptList6 = new ArrayList<>();
+        for (SysDept sysDept : sysDeptList) {
+            if(sysDept.getDeptName().contains("一年级")){
+                sysDeptList1.add(sysDept);
+            }else if(sysDept.getDeptName().contains("二年级")){
+                sysDeptList2.add(sysDept);
+            }else if(sysDept.getDeptName().contains("三年级")){
+                sysDeptList3.add(sysDept);
+            }else if(sysDept.getDeptName().contains("四年级")){
+                sysDeptList4.add(sysDept);
+            }else if(sysDept.getDeptName().contains("五年级")){
+                sysDeptList5.add(sysDept);
+            }else if(sysDept.getDeptName().contains("六年级")){
+                sysDeptList6.add(sysDept);
+            }
+        }
+        map.put("one",sysDeptList1);
+        map.put("two",sysDeptList2);
+        map.put("three",sysDeptList3);
+        map.put("four",sysDeptList4);
+        map.put("five",sysDeptList5);
+        map.put("six",sysDeptList6);
+        return AjaxResult.success(map);
+    }
+
+    @Override
+    public List<SysDept> selectDeptListChildren(Long parentId) {
+        return deptMapper.selectDeptListChildren(parentId);
+    }
+
     /**
      * 递归列表
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.SysUserDeptMapper;
+import com.ruoyi.system.domain.SysUserDept;
+import com.ruoyi.system.service.ISysUserDeptService;
+
+/**
+ * 用户和部门关联Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@Service
+public class SysUserDeptServiceImpl implements ISysUserDeptService 
+{
+    @Autowired
+    private SysUserDeptMapper sysUserDeptMapper;
+
+    /**
+     * 查询用户和部门关联
+     * 
+     * @param userId 用户和部门关联主键
+     * @return 用户和部门关联
+     */
+    @Override
+    public SysUserDept selectSysUserDeptByUserId(Long userId)
+    {
+        return sysUserDeptMapper.selectSysUserDeptByUserId(userId);
+    }
+
+    /**
+     * 查询用户和部门关联列表
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 用户和部门关联
+     */
+    @Override
+    public List<SysUserDept> selectSysUserDeptList(SysUserDept sysUserDept)
+    {
+        return sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+    }
+
+    /**
+     * 新增用户和部门关联
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 结果
+     */
+    @Override
+    public int insertSysUserDept(SysUserDept sysUserDept)
+    {
+        return sysUserDeptMapper.insertSysUserDept(sysUserDept);
+    }
+
+    /**
+     * 修改用户和部门关联
+     * 
+     * @param sysUserDept 用户和部门关联
+     * @return 结果
+     */
+    @Override
+    public int updateSysUserDept(SysUserDept sysUserDept)
+    {
+        return sysUserDeptMapper.updateSysUserDept(sysUserDept);
+    }
+
+    /**
+     * 批量删除用户和部门关联
+     * 
+     * @param userIds 需要删除的用户和部门关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysUserDeptByUserIds(Long[] userIds)
+    {
+        return sysUserDeptMapper.deleteSysUserDeptByUserIds(userIds);
+    }
+
+    /**
+     * 删除用户和部门关联信息
+     * 
+     * @param userId 用户和部门关联主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysUserDeptByUserId(Long userId)
+    {
+        return sysUserDeptMapper.deleteSysUserDeptByUserId(userId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -551,4 +551,9 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return successMsg.toString();
     }
+
+    @Override
+    public SysUser getByOpenId(String openId) {
+        return userMapper.getByOpenId(openId);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ZhxyShyjServiceImpl.java

@@ -0,0 +1,370 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.*;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.service.IZhxyShyjService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 智慧校园_审核意见Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@Service
+public class ZhxyShyjServiceImpl implements IZhxyShyjService 
+{
+    @Autowired
+    private ZhxyShyjMapper zhxyShyjMapper;
+    @Autowired
+    private RegisterSchoolMapper registerSchoolMapper;
+    @Autowired
+    private RegisterSchoolFileMapper registerSchoolFileMapper;
+    @Autowired
+    private RegisterTeacherMapper registerTeacherMapper;
+    @Autowired
+    private RegisterTeacherClassMapper registerTeacherClassMapper;
+    @Autowired
+    private RegisterParentsMapper registerParentsMapper;
+    @Autowired
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+    @Autowired
+    private SysUserMapper userMapper;
+    @Autowired
+    private SysDeptMapper deptMapper;
+    @Autowired
+    private SysUserDeptMapper sysUserDeptMapper;
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+    @Autowired
+    private SysUserServiceImpl sysUserServiceImpl;
+    @Autowired
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+    @Autowired
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+    @Autowired
+    private SysUserRoleMapper userRoleMapper;
+
+
+    /**
+     * 查询智慧校园_审核意见
+     * 
+     * @param id 智慧校园_审核意见主键
+     * @return 智慧校园_审核意见
+     */
+    @Override
+    public ZhxyShyj selectZhxyShyjById(Long id)
+    {
+        return zhxyShyjMapper.selectZhxyShyjById(id);
+    }
+
+    /**
+     * 查询智慧校园_审核意见列表
+     * 
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 智慧校园_审核意见
+     */
+    @Override
+    public List<ZhxyShyj> selectZhxyShyjList(ZhxyShyj zhxyShyj)
+    {
+        return zhxyShyjMapper.selectZhxyShyjList(zhxyShyj);
+    }
+
+    /**
+     * 新增智慧校园_审核意见
+     * 
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertZhxyShyj(ZhxyShyj zhxyShyj)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        zhxyShyj.setAuditId(user.getUserId());
+        zhxyShyj.setAuditUser(user.getNickName());
+        zhxyShyj.setShsj(DateUtils.getNowDate());
+        zhxyShyj.setCreateTime(DateUtils.getNowDate());
+        zhxyShyj.setCreateTime(DateUtils.getNowDate());
+        int index = zhxyShyjMapper.insertZhxyShyj(zhxyShyj);
+        //审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
+        //审核结果（是否通过  1：待审核，2：通过 3:不通过)
+        if("1".equals(zhxyShyj.getType())){
+            //学校注册
+            if("2".equals(zhxyShyj.getShjg())){
+                //通过  修改注册表审核结果，生成账号，部门表生成学校， 新增用户与角色管理
+                //查询数据信息
+                RegisterSchool registerSchool = registerSchoolMapper.selectRegisterSchoolById(zhxyShyj.getDataId());
+                //修改注册表审核结果
+                registerSchool.setAuditId(user.getUserId());
+                registerSchool.setAuditUser(user.getNickName());
+                registerSchool.setOpinion(zhxyShyj.getShyj());
+                registerSchool.setIsPass(zhxyShyj.getShjg());
+                registerSchool.setUpdateTime(DateUtils.getNowDate());
+                registerSchoolMapper.updateRegisterSchool(registerSchool);
+                //部门表生成学校
+                SysDept dept = new SysDept();
+                dept.setParentId(0L);
+                dept.setAncestors("0");
+                dept.setDeptName(registerSchool.getSchoolName());
+                    //查询最新的ParentId为100的数据
+                SysDept sysDept = deptMapper.selectDeptByParentId(0L);
+                dept.setOrderNum(sysDept.getOrderNum()+1);
+                dept.setLeader(registerSchool.getUserName());
+                dept.setPhone(registerSchool.getUserPhone());
+                dept.setCreateTime(DateUtils.getNowDate());
+                deptMapper.insertDept(dept);
+                //生成账号
+                SysUser use = new SysUser();
+                use.setOpenId(registerSchool.getOpenId());
+                use.setDeptId(dept.getDeptId());
+                use.setUserName(registerSchool.getUserPhone());
+                use.setNickName(registerSchool.getSchoolName());
+                use.setPhonenumber(registerSchool.getUserPhone());
+                use.setPassword(SecurityUtils.encryptPassword("1qaz!QAZ"));
+                use.setCreateTime(DateUtils.getNowDate());
+                userMapper.insertUser(use);
+                //新增用户与角色管理
+                Long[] roleIds = {4L};
+                sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds);
+            }else{
+                //不通过  修改注册表审核结果
+                //修改注册表审核结果
+                RegisterSchool registerSchool = new RegisterSchool();
+                registerSchool.setId(zhxyShyj.getDataId());
+                registerSchool.setAuditId(user.getUserId());
+                registerSchool.setAuditUser(user.getNickName());
+                registerSchool.setOpinion(zhxyShyj.getShyj());
+                registerSchool.setIsPass(zhxyShyj.getShjg());
+                registerSchool.setUpdateTime(DateUtils.getNowDate());
+                registerSchoolMapper.updateRegisterSchool(registerSchool);
+            }
+        }else if("2".equals(zhxyShyj.getType())){
+            //老师注册
+            if("2".equals(zhxyShyj.getShjg())){
+                //通过  修改注册表审核结果，生成账号， 新增用户与角色管理，老师-班级（学科）数据
+                //查询数据信息
+                RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherById(zhxyShyj.getDataId());
+                RegisterTeacherClass registerTeacherClass = new RegisterTeacherClass();
+                registerTeacherClass.setTeacherId(registerTeacher.getId());
+                List<RegisterTeacherClass> registerTeacherClassList = registerTeacherClassMapper.selectRegisterTeacherClassList(registerTeacherClass);
+                //修改注册表审核结果
+                registerTeacher.setAuditId(user.getUserId());
+                registerTeacher.setAuditUser(user.getNickName());
+                registerTeacher.setOpinion(zhxyShyj.getShyj());
+                registerTeacher.setIsPass(zhxyShyj.getShjg());
+                registerTeacher.setUpdateTime(DateUtils.getNowDate());
+                registerTeacherMapper.updateRegisterTeacher(registerTeacher);
+                //生成账号
+                //判断是否存在账号
+                SysUser use = userMapper.getByOpenId(registerTeacher.getOpenId());
+                if(use==null){
+                    use = new SysUser();
+                    use.setOpenId(registerTeacher.getOpenId());
+                    //use.setDeptId(dept.getDeptId());
+                    use.setUserName(registerTeacher.getUserPhone());
+                    use.setNickName(registerTeacher.getUserName());
+                    use.setPhonenumber(registerTeacher.getUserPhone());
+                    use.setPassword(SecurityUtils.encryptPassword("1qaz!QAZ"));
+                    use.setCreateTime(DateUtils.getNowDate());
+                    userMapper.insertUser(use);
+                }
+
+                //新增用户与角色管理
+                Long[] roleIds = {3L};
+                sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds);
+                //老师-班级（学科）数据
+                for (RegisterTeacherClass 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.insertFormalTeacherClass(formalTeacherClass);
+                }
+
+            }else{
+                //不通过  修改注册表审核结果
+                //修改注册表审核结果
+                RegisterTeacher registerTeacher = new RegisterTeacher();
+                registerTeacher.setId(zhxyShyj.getId());
+                registerTeacher.setAuditId(user.getUserId());
+                registerTeacher.setAuditUser(user.getNickName());
+                registerTeacher.setOpinion(zhxyShyj.getShyj());
+                registerTeacher.setIsPass(zhxyShyj.getShjg());
+                registerTeacher.setUpdateTime(DateUtils.getNowDate());
+                registerTeacherMapper.updateRegisterTeacher(registerTeacher);
+            }
+        }else if("3".equals(zhxyShyj.getType())){
+            //审核类型（1：学校注册，2：老师注册，3：家长注册，4：调课）
+            //家长注册
+            //查询数据信息
+            RegisterParentsStudent registerParentsStudent = registerParentsStudentMapper.selectRegisterParentsStudentById(zhxyShyj.getDataId());
+            RegisterParents registerParents = registerParentsMapper.selectRegisterParentsById(registerParentsStudent.getParentsId());
+            if("2".equals(zhxyShyj.getShjg())){
+
+                //通过  修改注册表审核结果，生成账号， 新增用户与角色管理，家长-学生(审核通过之后数据)
+                //查询是否存在账号
+                SysUser sysUser = userMapper.getByOpenId(registerParents.getOpenId());
+
+                //修改注册表审核结果
+                registerParentsStudent.setAuditId(user.getUserId());
+                registerParentsStudent.setAuditUser(user.getNickName());
+                registerParentsStudent.setOpinion(zhxyShyj.getShyj());
+                registerParentsStudent.setIsPass(zhxyShyj.getShjg());
+                registerParentsStudent.setUpdateTime(DateUtils.getNowDate());
+                registerParentsStudentMapper.updateRegisterParentsStudent(registerParentsStudent);
+
+                if(sysUser==null){
+                    //账号不存在
+                    registerParents.setIsPass(zhxyShyj.getShjg());
+                    registerParentsMapper.updateRegisterParents(registerParents);
+                    //生成账号
+                    sysUser = new SysUser();
+                    sysUser.setOpenId(registerParents.getOpenId());
+                    //use.setDeptId(dept.getDeptId());
+                    sysUser.setUserName(registerParents.getUserPhone());
+                    sysUser.setNickName(registerParents.getUserName());
+                    sysUser.setPhonenumber(registerParents.getUserPhone());
+                    sysUser.setPassword(SecurityUtils.encryptPassword("1qaz!QAZ"));
+                    sysUser.setCreateTime(DateUtils.getNowDate());
+                    userMapper.insertUser(sysUser);
+                    //新增用户与角色管理
+                    Long[] roleIds = {5L};
+                    sysUserServiceImpl.insertUserRole(sysUser.getUserId(), roleIds);
+                }else{
+                    FormalParentsStudent parentsStudent = new FormalParentsStudent();
+                    parentsStudent.setParentsId(sysUser.getUserId());
+                    List<FormalParentsStudent> parentsStudentList = formalParentsStudentMapper.selectFormalParentsStudentList(parentsStudent);
+                    if(parentsStudentList==null || parentsStudentList.size()<=0){
+                        //新增用户与角色管理
+                        Long[] roleIds = {5L};
+                        sysUserServiceImpl.insertUserRole(sysUser.getUserId(), roleIds);
+                    }
+                }
+
+                //新增家长-学生(审核通过之后数据)
+                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(user.getNickName());
+                formalParentsStudentMapper.insertFormalParentsStudent(formalParentsStudent);
+
+            }else{
+                //不通过  修改注册表审核结果
+                //修改注册表审核结果
+                RegisterParentsStudent registerParentsStudentNo = new RegisterParentsStudent();
+                registerParentsStudentNo.setId(zhxyShyj.getDataId());
+                registerParentsStudentNo.setAuditId(user.getUserId());
+                registerParentsStudentNo.setAuditUser(user.getNickName());
+                registerParentsStudentNo.setOpinion(zhxyShyj.getShyj());
+                registerParentsStudentNo.setIsPass(zhxyShyj.getShjg());
+                registerParentsStudentNo.setUpdateTime(DateUtils.getNowDate());
+                registerParentsStudentMapper.updateRegisterParentsStudent(registerParentsStudentNo);
+                //判断是否所有的都不通过（查询是否存在待审核和审核通过的数据）
+                RegisterParentsStudent parentsStudent = new RegisterParentsStudent();
+                parentsStudent.setParentsId(registerParents.getId());
+                List<RegisterParentsStudent> registerParentsStudentList = registerParentsStudentMapper.selectRegisterParentsStudentList(parentsStudent);
+                Boolean bl = true;
+                for (RegisterParentsStudent student : registerParentsStudentList) {
+                    if(!"3".equals(student.getIsPass())){
+                        bl = false;
+                        break;
+                    }
+                }
+                //全部都不通过才改家长表状态
+                if(bl){
+                    registerParents.setIsPass(zhxyShyj.getShjg());
+                    registerParentsMapper.updateRegisterParents(registerParents);
+                }
+
+            }
+        }
+        return index;
+    }
+
+    /***
+     * 生成班级
+     * @param sysDept
+     * @return
+     */
+    private List<SysDept> createClassList(SysDept sysDept) {
+        SysDictData dictData = new SysDictData();
+        dictData.setDictType("sys_class");
+        List<SysDictData> sysDictDataList = dictDataMapper.selectDictDataList(dictData);
+
+        List<SysDept> sysDeptList = new ArrayList<>();
+        String ancestors = "0"+","+String.valueOf(sysDept.getDeptId());
+        int index = 1;
+        for (SysDictData sysDictData : sysDictDataList) {
+            SysDept dept = new SysDept();
+            dept.setParentId(sysDept.getDeptId());
+            dept.setAncestors(ancestors);
+            dept.setDeptName(sysDictData.getDictLabel());
+            dept.setOrderNum(index);
+            dept.setStatus("1");
+            dept.setCreateTime(DateUtils.getNowDate());
+            sysDeptList.add(dept);
+            index = index+5;
+        }
+
+        return sysDeptList;
+    }
+
+    /**
+     * 修改智慧校园_审核意见
+     * 
+     * @param zhxyShyj 智慧校园_审核意见
+     * @return 结果
+     */
+    @Override
+    public int updateZhxyShyj(ZhxyShyj zhxyShyj)
+    {
+        zhxyShyj.setUpdateTime(DateUtils.getNowDate());
+        return zhxyShyjMapper.updateZhxyShyj(zhxyShyj);
+    }
+
+    /**
+     * 批量删除智慧校园_审核意见
+     * 
+     * @param ids 需要删除的智慧校园_审核意见主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZhxyShyjByIds(Long[] ids)
+    {
+        return zhxyShyjMapper.deleteZhxyShyjByIds(ids);
+    }
+
+    /**
+     * 删除智慧校园_审核意见信息
+     * 
+     * @param id 智慧校园_审核意见主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZhxyShyjById(Long id)
+    {
+        return zhxyShyjMapper.deleteZhxyShyjById(id);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/FormalParentsStudentMapper.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.FormalParentsStudentMapper">
+    
+    <resultMap type="FormalParentsStudent" id="FormalParentsStudentResult">
+        <result property="id"    column="id"    />
+        <result property="parentsId"    column="parents_id"    />
+        <result property="schoolId"    column="school_id"    />
+        <result property="schoolName"    column="school_name"    />
+        <result property="classId"    column="class_id"    />
+        <result property="className"    column="class_name"    />
+        <result property="studentName"    column="student_name"    />
+        <result property="studentNumber"    column="student_number"    />
+        <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="selectFormalParentsStudentVo">
+        select id, parents_id, school_id, school_name, class_id, class_name, student_name, student_number, create_by, create_time, update_by, update_time, remark from formal_parents_student
+    </sql>
+
+    <select id="selectFormalParentsStudentList" parameterType="FormalParentsStudent" resultMap="FormalParentsStudentResult">
+        <include refid="selectFormalParentsStudentVo"/>
+        <where>  
+            <if test="parentsId != null  and parentsId != ''"> and parents_id = #{parentsId}</if>
+            <if test="schoolId != null  and schoolId != ''"> and school_id = #{schoolId}</if>
+            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
+            <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
+            <if test="studentNumber != null  and studentNumber != ''"> and student_number = #{studentNumber}</if>
+        </where>
+    </select>
+    
+    <select id="selectFormalParentsStudentById" parameterType="Long" resultMap="FormalParentsStudentResult">
+        <include refid="selectFormalParentsStudentVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFormalParentsStudent" parameterType="FormalParentsStudent" useGeneratedKeys="true" keyProperty="id">
+        insert into formal_parents_student
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parentsId != null">parents_id,</if>
+            <if test="schoolId != null">school_id,</if>
+            <if test="schoolName != null">school_name,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="className != null">class_name,</if>
+            <if test="studentName != null">student_name,</if>
+            <if test="studentNumber != null">student_number,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parentsId != null">#{parentsId},</if>
+            <if test="schoolId != null">#{schoolId},</if>
+            <if test="schoolName != null">#{schoolName},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="className != null">#{className},</if>
+            <if test="studentName != null">#{studentName},</if>
+            <if test="studentNumber != null">#{studentNumber},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFormalParentsStudent" parameterType="FormalParentsStudent">
+        update formal_parents_student
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentsId != null">parents_id = #{parentsId},</if>
+            <if test="schoolId != null">school_id = #{schoolId},</if>
+            <if test="schoolName != null">school_name = #{schoolName},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="className != null">class_name = #{className},</if>
+            <if test="studentName != null">student_name = #{studentName},</if>
+            <if test="studentNumber != null">student_number = #{studentNumber},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFormalParentsStudentById" parameterType="Long">
+        delete from formal_parents_student where id = #{id}
+    </delete>
+
+    <delete id="deleteFormalParentsStudentByIds" parameterType="String">
+        delete from formal_parents_student where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/FormalTeacherClassMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="FormalTeacherClass" id="FormalTeacherClassResult">
         <result property="id"    column="id"    />
         <result property="teacherId"    column="teacher_id"    />
+        <result property="teacherName"    column="teacher_name"    />
         <result property="schoolId"    column="school_id"    />
         <result property="schoolName"    column="school_name"    />
         <result property="classId"    column="class_id"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFormalTeacherClassVo">
-        select id, teacher_id, school_id, school_name, class_id, class_name, discipline, create_by, create_time, update_by, update_time, remark from formal_teacher_class
+        select id, teacher_id,teacher_name, school_id, school_name, class_id, class_name, discipline, create_by, create_time, update_by, update_time, remark from formal_teacher_class
     </sql>
 
     <select id="selectFormalTeacherClassList" parameterType="FormalTeacherClass" resultMap="FormalTeacherClassResult">
@@ -39,15 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFormalTeacherClassVo"/>
         where id = #{id}
     </select>
-    <select id="getTeacherClass" parameterType="string" resultMap="FormalTeacherClassResult">
-        <include refid="selectFormalTeacherClassVo"/>
-        where teacher_id = #{teacherId}
-    </select>
-
+        
     <insert id="insertFormalTeacherClass" parameterType="FormalTeacherClass" useGeneratedKeys="true" keyProperty="id">
         insert into formal_teacher_class
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="teacherId != null and teacherId != ''">teacher_id,</if>
+            <if test="teacherName != null">teacher_name,</if>
             <if test="schoolId != null">school_id,</if>
             <if test="schoolName != null">school_name,</if>
             <if test="classId != null and classId != ''">class_id,</if>
@@ -61,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="teacherId != null and teacherId != ''">#{teacherId},</if>
+            <if test="teacherName != null">#{teacherName},</if>
             <if test="schoolId != null">#{schoolId},</if>
             <if test="schoolName != null">#{schoolName},</if>
             <if test="classId != null and classId != ''">#{classId},</if>
@@ -78,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update formal_teacher_class
         <trim prefix="SET" suffixOverrides=",">
             <if test="teacherId != null and teacherId != ''">teacher_id = #{teacherId},</if>
+            <if test="teacherName != null">teacher_name= #{teacherName},</if>
             <if test="schoolId != null">school_id = #{schoolId},</if>
             <if test="schoolName != null">school_name = #{schoolName},</if>
             <if test="classId != null and classId != ''">class_id = #{classId},</if>
@@ -102,4 +102,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteFormalTeacherClassByTeacherId" parameterType="java.lang.Long">
+        delete from formal_teacher_class where teacher_id = #{userId}
+    </delete>
+
+    <select id="getTeacherClass" parameterType="string" resultMap="FormalTeacherClassResult">
+        <include refid="selectFormalTeacherClassVo"/>
+        where teacher_id = #{teacherId}
+    </select>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/RegisterParentsMapper.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RegisterParentsMapper">
+    
+    <resultMap type="RegisterParents" id="RegisterParentsResult">
+        <result property="id"    column="id"    />
+        <result property="openId"    column="open_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userPhone"    column="user_phone"    />
+        <result property="isPass"    column="is_pass"    />
+        <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="selectRegisterParentsVo">
+        select id,open_id, user_name, user_phone,is_pass, create_by, create_time, update_by, update_time, remark from register_parents
+    </sql>
+
+    <select id="selectRegisterParentsList" parameterType="RegisterParents" resultMap="RegisterParentsResult">
+        <include refid="selectRegisterParentsVo"/>
+        <where>
+            <if test="openId != null  and openId != ''"> and open_id = #{openId},</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
+            <if test="isPass != null  and isPass != ''"> and is_pass = #{isPass}</if>
+        </where>
+    </select>
+    
+    <select id="selectRegisterParentsById" parameterType="Long" resultMap="RegisterParentsResult">
+        <include refid="selectRegisterParentsVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectRegisterParentsByOppenId" resultMap="RegisterParentsResult" parameterType="java.lang.String">
+        <include refid="selectRegisterParentsVo"/>
+        where  open_id = #{openId} limit 1
+    </select>
+
+    <insert id="insertRegisterParents" parameterType="RegisterParents" useGeneratedKeys="true" keyProperty="id">
+        insert into register_parents
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="openId != null  and openId != ''">open_id ,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="userPhone != null">user_phone,</if>
+            <if test="isPass != null">is_pass,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="openId != null  and openId != ''">#{openId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="userPhone != null">#{userPhone},</if>
+            <if test="isPass != null">#{isPass},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRegisterParents" parameterType="RegisterParents">
+        update register_parents
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openId != null  and openId != ''">  open_id = #{openId},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="isPass != null">is_pass = #{isPass},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRegisterParentsById" parameterType="Long">
+        delete from register_parents where id = #{id}
+    </delete>
+
+    <delete id="deleteRegisterParentsByIds" parameterType="String">
+        delete from register_parents where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/RegisterParentsStudentMapper.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RegisterParentsStudentMapper">
+    
+    <resultMap type="RegisterParentsStudent" id="RegisterParentsStudentResult">
+        <result property="id"    column="id"    />
+        <result property="parentsId"    column="parents_id"    />
+
+        <result property="parentsName"    column="parents_name"    />
+        <result property="parentsPhone"    column="parents_phone"    />
+
+        <result property="schoolId"    column="school_id"    />
+        <result property="schoolName"    column="school_name"    />
+        <result property="classId"    column="class_id"    />
+        <result property="className"    column="class_name"    />
+        <result property="studentName"    column="student_name"    />
+        <result property="studentNumber"    column="student_number"    />
+        <result property="isPass"    column="is_pass"    />
+        <result property="auditId"    column="audit_id"    />
+        <result property="auditUser"    column="audit_user"    />
+        <result property="opinion"    column="opinion"    />
+        <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="selectRegisterParentsStudentVo">
+        select id, parents_id,parents_name,parents_phone, school_id, school_name, class_id, class_name, student_name, student_number, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_parents_student
+    </sql>
+
+    <select id="selectRegisterParentsStudentList" parameterType="RegisterParentsStudent" resultMap="RegisterParentsStudentResult">
+        <include refid="selectRegisterParentsStudentVo"/>
+        <where>  
+            <if test="parentsId != null  and parentsId != ''"> and parents_id = #{parentsId}</if>
+            <if test="parentsName != null  and parentsName != ''"> and parents_name = #{parentsName}</if>
+            <if test="parentsPhone != null  and parentsPhone != ''"> and parents_phone = #{parentsPhone}</if>
+            <if test="schoolId != null  and schoolId != ''"> and school_id = #{schoolId}</if>
+            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
+            <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
+            <if test="studentNumber != null  and studentNumber != ''"> and student_number = #{studentNumber}</if>
+            <if test="isPass != null  and isPass != ''"> and is_pass = #{isPass}</if>
+            <if test="auditId != null "> and audit_id = #{auditId}</if>
+            <if test="auditUser != null  and auditUser != ''"> and audit_user = #{auditUser}</if>
+            <if test="classIds != null  and classIds.size()>0">
+                and class_id in
+                <foreach collection="classIds" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+        </where>
+    </select>
+    
+    <select id="selectRegisterParentsStudentById" parameterType="Long" resultMap="RegisterParentsStudentResult">
+        <include refid="selectRegisterParentsStudentVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRegisterParentsStudent" parameterType="RegisterParentsStudent" useGeneratedKeys="true" keyProperty="id">
+        insert into register_parents_student
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parentsId != null">parents_id,</if>
+            <if test="parentsName != null "> parents_name ,</if>
+            <if test="parentsPhone != null "> parents_phone,</if>
+            <if test="schoolId != null">school_id,</if>
+            <if test="schoolName != null">school_name,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="className != null">class_name,</if>
+            <if test="studentName != null">student_name,</if>
+            <if test="studentNumber != null">student_number,</if>
+            <if test="isPass != null">is_pass,</if>
+            <if test="auditId != null">audit_id,</if>
+            <if test="auditUser != null">audit_user,</if>
+            <if test="opinion != null">opinion,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parentsId != null">#{parentsId},</if>
+            <if test="parentsName != null "> #{parentsName},</if>
+            <if test="parentsPhone != null "> #{parentsPhone},</if>
+            <if test="schoolId != null">#{schoolId},</if>
+            <if test="schoolName != null">#{schoolName},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="className != null">#{className},</if>
+            <if test="studentName != null">#{studentName},</if>
+            <if test="studentNumber != null">#{studentNumber},</if>
+            <if test="isPass != null">#{isPass},</if>
+            <if test="auditId != null">#{auditId},</if>
+            <if test="auditUser != null">#{auditUser},</if>
+            <if test="opinion != null">#{opinion},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRegisterParentsStudent" parameterType="RegisterParentsStudent">
+        update register_parents_student
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentsId != null">parents_id = #{parentsId},</if>
+            <if test="parentsName != null "> parents_name = #{parentsName},</if>
+            <if test="parentsPhone != null "> parents_phone = #{parentsPhone},</if>
+            <if test="schoolId != null">school_id = #{schoolId},</if>
+            <if test="schoolName != null">school_name = #{schoolName},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="className != null">class_name = #{className},</if>
+            <if test="studentName != null">student_name = #{studentName},</if>
+            <if test="studentNumber != null">student_number = #{studentNumber},</if>
+            <if test="isPass != null">is_pass = #{isPass},</if>
+            <if test="auditId != null">audit_id= #{auditId},</if>
+            <if test="auditUser != null">audit_user= #{auditUser},</if>
+            <if test="opinion != null">opinion= #{opinion},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRegisterParentsStudentById" parameterType="Long">
+        delete from register_parents_student where id = #{id}
+    </delete>
+
+    <delete id="deleteRegisterParentsStudentByIds" parameterType="String">
+        delete from register_parents_student where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteRegisterParentsStudentByParentsId" parameterType="java.lang.Long">
+        delete from register_parents_student where parents_id = #{parentsId} and isPass = '3';
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/RegisterSchoolFileMapper.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RegisterSchoolFileMapper">
+    
+    <resultMap type="RegisterSchoolFile" id="RegisterSchoolFileResult">
+        <result property="id"    column="id"    />
+        <result property="schoolId"    column="school_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="name"    column="name"    />
+        <result property="url"    column="url"    />
+        <result property="type"    column="type"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectRegisterSchoolFileVo">
+        select id, school_id, dept_id, name, url, type, remark from register_school_file
+    </sql>
+
+    <select id="selectRegisterSchoolFileList" parameterType="RegisterSchoolFile" resultMap="RegisterSchoolFileResult">
+        <include refid="selectRegisterSchoolFileVo"/>
+        <where>  
+            <if test="schoolId != null "> and school_id = #{schoolId}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="url != null  and url != ''"> and url = #{url}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+    </select>
+    
+    <select id="selectRegisterSchoolFileById" parameterType="Long" resultMap="RegisterSchoolFileResult">
+        <include refid="selectRegisterSchoolFileVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRegisterSchoolFile" parameterType="RegisterSchoolFile" useGeneratedKeys="true" keyProperty="id">
+        insert into register_school_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="schoolId != null">school_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="name != null and name != ''">name,</if>
+            <if test="url != null">url,</if>
+            <if test="type != null">type,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="schoolId != null">#{schoolId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="url != null">#{url},</if>
+            <if test="type != null">#{type},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRegisterSchoolFile" parameterType="RegisterSchoolFile">
+        update register_school_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="schoolId != null">school_id = #{schoolId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="url != null">url = #{url},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRegisterSchoolFileById" parameterType="Long">
+        delete from register_school_file where id = #{id}
+    </delete>
+
+    <delete id="deleteRegisterSchoolFileByIds" parameterType="String">
+        delete from register_school_file where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <delete id="deleteRegisterSchoolFileBySchoolId" parameterType="java.lang.Long">
+        delete from register_school_file where school_id = #{schoolId}
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/RegisterSchoolMapper.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RegisterSchoolMapper">
+    
+    <resultMap type="RegisterSchool" id="RegisterSchoolResult">
+        <result property="id"    column="id"    />
+        <result property="openId"    column="open_id"    />
+        <result property="schoolName"    column="school_name"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userPhone"    column="user_phone"    />
+        <result property="isPass"    column="is_pass"    />
+        <result property="auditId"    column="audit_id"    />
+        <result property="auditUser"    column="audit_user"    />
+        <result property="opinion"    column="opinion"    />
+        <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="selectRegisterSchoolVo">
+        select id,open_id, school_name, user_name, user_phone, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_school
+    </sql>
+
+    <select id="selectRegisterSchoolList" parameterType="RegisterSchool" resultMap="RegisterSchoolResult">
+        <include refid="selectRegisterSchoolVo"/>
+        <where>
+            <if test="openId != null  and openId != ''"> and open_id = #{openId},</if>
+            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
+            <if test="isPass != null  and isPass != ''"> and is_pass = #{isPass}</if>
+            <if test="auditId != null "> and audit_id = #{auditId}</if>
+            <if test="auditUser != null  and auditUser != ''"> and audit_user = #{auditUser}</if>
+        </where>
+    </select>
+    
+    <select id="selectRegisterSchoolById" parameterType="Long" resultMap="RegisterSchoolResult">
+        <include refid="selectRegisterSchoolVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectRegisterSchooByOppenId" resultMap="RegisterSchoolResult" parameterType="java.lang.String">
+        <include refid="selectRegisterSchoolVo"/>
+        where  open_id = #{openId} limit 1
+    </select>
+
+    <insert id="insertRegisterSchool" parameterType="RegisterSchool" useGeneratedKeys="true" keyProperty="id">
+        insert into register_school
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="openId != null  and openId != ''">open_id, </if>
+            <if test="schoolName != null and schoolName != ''">school_name,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="userPhone != null">user_phone,</if>
+            <if test="isPass != null">is_pass,</if>
+            <if test="auditId != null">audit_id,</if>
+            <if test="auditUser != null">audit_user,</if>
+            <if test="opinion != null">opinion,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="openId != null  and openId != ''"> #{openId},</if>
+            <if test="schoolName != null and schoolName != ''">#{schoolName},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="userPhone != null">#{userPhone},</if>
+            <if test="isPass != null">#{isPass},</if>
+            <if test="auditId != null">#{auditId},</if>
+            <if test="auditUser != null">#{auditUser},</if>
+            <if test="opinion != null">#{opinion},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRegisterSchool" parameterType="RegisterSchool">
+        update register_school
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openId != null  and openId != ''"> open_id = #{openId},</if>
+            <if test="schoolName != null and schoolName != ''">school_name = #{schoolName},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="isPass != null">is_pass = #{isPass},</if>
+            <if test="auditId != null">audit_id= #{auditId},</if>
+            <if test="auditUser != null">audit_user= #{auditUser},</if>
+            <if test="opinion != null">opinion= #{opinion},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRegisterSchoolById" parameterType="Long">
+        delete from register_school where id = #{id}
+    </delete>
+
+    <delete id="deleteRegisterSchoolByIds" parameterType="String">
+        delete from register_school where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/RegisterTeacherClassMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RegisterTeacherClassMapper">
+    
+    <resultMap type="RegisterTeacherClass" id="RegisterTeacherClassResult">
+        <result property="id"    column="id"    />
+        <result property="teacherId"    column="teacher_id"    />
+        <result property="classId"    column="class_id"    />
+        <result property="className"    column="class_name"    />
+        <result property="discipline"    column="discipline"    />
+        <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="selectRegisterTeacherClassVo">
+        select id, teacher_id, class_id, class_name, discipline, create_by, create_time, update_by, update_time, remark from register_teacher_class
+    </sql>
+
+    <select id="selectRegisterTeacherClassList" parameterType="RegisterTeacherClass" resultMap="RegisterTeacherClassResult">
+        <include refid="selectRegisterTeacherClassVo"/>
+        <where>  
+            <if test="teacherId != null  and teacherId != ''"> and teacher_id = #{teacherId}</if>
+            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
+            <if test="discipline != null  and discipline != ''"> and discipline = #{discipline}</if>
+        </where>
+    </select>
+    
+    <select id="selectRegisterTeacherClassById" parameterType="Long" resultMap="RegisterTeacherClassResult">
+        <include refid="selectRegisterTeacherClassVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertRegisterTeacherClass" parameterType="RegisterTeacherClass" useGeneratedKeys="true" keyProperty="id">
+        insert into register_teacher_class
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="teacherId != null and teacherId != ''">teacher_id,</if>
+            <if test="classId != null and classId != ''">class_id,</if>
+            <if test="className != null and className != ''">class_name,</if>
+            <if test="discipline != null and discipline != ''">discipline,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="teacherId != null and teacherId != ''">#{teacherId},</if>
+            <if test="classId != null and classId != ''">#{classId},</if>
+            <if test="className != null and className != ''">#{className},</if>
+            <if test="discipline != null and discipline != ''">#{discipline},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRegisterTeacherClass" parameterType="RegisterTeacherClass">
+        update register_teacher_class
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="teacherId != null and teacherId != ''">teacher_id = #{teacherId},</if>
+            <if test="classId != null and classId != ''">class_id = #{classId},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="discipline != null and discipline != ''">discipline = #{discipline},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRegisterTeacherClassById" parameterType="Long">
+        delete from register_teacher_class where id = #{id}
+    </delete>
+
+    <delete id="deleteRegisterTeacherClassByIds" parameterType="String">
+        delete from register_teacher_class where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteRegisterTeacherClassByTeacherId" parameterType="java.lang.Long">
+        delete from register_teacher_class where teacher_id = #{teacherId}
+    </delete>
+    <delete id="deleteRegisterTeacherClassByTeacherIds" parameterType="String">
+        delete from register_teacher_class where id teacher_id
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.RegisterTeacherMapper">
+    
+    <resultMap type="RegisterTeacher" id="RegisterTeacherResult">
+        <result property="id"    column="id"    />
+        <result property="openId"    column="open_id"    />
+        <result property="schoolId"    column="school_id"    />
+        <result property="schoolName"    column="school_name"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userPhone"    column="user_phone"    />
+        <result property="isPass"    column="is_pass"    />
+        <result property="auditId"    column="audit_id"    />
+        <result property="auditUser"    column="audit_user"    />
+        <result property="opinion"    column="opinion"    />
+        <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="selectRegisterTeacherVo">
+        select id,open_id, school_id, school_name, user_name, user_phone, is_pass,audit_id,audit_user,opinion, create_by, create_time, update_by, update_time, remark from register_teacher
+    </sql>
+
+    <select id="selectRegisterTeacherList" parameterType="RegisterTeacher" resultMap="RegisterTeacherResult">
+        <include refid="selectRegisterTeacherVo"/>
+        <where>
+            <if test="openId != null">and open_id = #{openId},</if>
+            <if test="schoolId != null  and schoolId != ''"> and school_id = #{schoolId}</if>
+            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
+            <if test="isPass != null  and isPass != ''"> and is_pass = #{isPass}</if>
+            <if test="auditId != null "> and audit_id = #{auditId}</if>
+            <if test="auditUser != null  and auditUser != ''"> and audit_user = #{auditUser}</if>
+        </where>
+    </select>
+    
+    <select id="selectRegisterTeacherById" parameterType="Long" resultMap="RegisterTeacherResult">
+        <include refid="selectRegisterTeacherVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectRegisterTeacherByOppenId" resultMap="RegisterTeacherResult" parameterType="java.lang.String">
+        <include refid="selectRegisterTeacherVo"/>
+        where  open_id = #{openId} limit 1
+    </select>
+
+    <insert id="insertRegisterTeacher" parameterType="RegisterTeacher" useGeneratedKeys="true" keyProperty="id">
+        insert into register_teacher
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="openId != null">open_id,</if>
+            <if test="schoolId != null and schoolId != ''">school_id,</if>
+            <if test="schoolName != null and schoolName != ''">school_name,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="userPhone != null">user_phone,</if>
+            <if test="isPass != null">is_pass,</if>
+            <if test="auditId != null">audit_id,</if>
+            <if test="auditUser != null">audit_user,</if>
+            <if test="opinion != null">opinion,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="openId != null">#{openId},</if>
+            <if test="schoolId != null and schoolId != ''">#{schoolId},</if>
+            <if test="schoolName != null and schoolName != ''">#{schoolName},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="userPhone != null">#{userPhone},</if>
+            <if test="isPass != null">#{isPass},</if>
+            <if test="auditId != null">#{auditId},</if>
+            <if test="auditUser != null">#{auditUser},</if>
+            <if test="opinion != null">#{opinion},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRegisterTeacher" parameterType="RegisterTeacher">
+        update register_teacher
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="openId != null">open_id = #{openId},</if>
+            <if test="schoolId != null and schoolId != ''">school_id = #{schoolId},</if>
+            <if test="schoolName != null and schoolName != ''">school_name = #{schoolName},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="isPass != null">is_pass = #{isPass},</if>
+            <if test="auditId != null">audit_id= #{auditId},</if>
+            <if test="auditUser != null">audit_user= #{auditUser},</if>
+            <if test="opinion != null">opinion= #{opinion},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteRegisterTeacherById" parameterType="Long">
+        delete from register_teacher where id = #{id}
+    </delete>
+
+    <delete id="deleteRegisterTeacherByIds" parameterType="String">
+        delete from register_teacher where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -86,10 +86,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectDeptVo"/>
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
-    
-    <insert id="insertDept" parameterType="SysDept">
+    <select id="selectDeptByParentId" parameterType="Long" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where parent_id = #{parentId} order by create_time desc limit 1
+	</select>
+    <select id="selectDeptListChildren" resultMap="SysDeptResult" parameterType="SysDept">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0'
+		AND parent_id = #{parentId}
+		AND status = '0'
+	</select>
+
+    <insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId">
  		insert into sys_dept(
- 			<if test="deptId != null and deptId != 0">dept_id,</if>
+ 			<!--<if test="deptId != null and deptId != 0">dept_id,</if>-->
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
  			<if test="ancestors != null and ancestors != ''">ancestors,</if>
@@ -101,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
  		)values(
- 			<if test="deptId != null and deptId != 0">#{deptId},</if>
+ 			<!--<if test="deptId != null and deptId != 0">#{deptId},</if>-->
  			<if test="parentId != null and parentId != 0">#{parentId},</if>
  			<if test="deptName != null and deptName != ''">#{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
@@ -114,7 +124,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
+	<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="updateDept" parameterType="SysDept">
  		update sys_dept
  		<set>
@@ -151,7 +167,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         	#{deptId}
         </foreach>
 	</update>
-	
+	<update id="updateDeptIsStatus" parameterType="java.lang.Long">
+		update sys_dept set status = '1' where parent_id = #{parentId}
+	</update>
+
 	<delete id="deleteDeptById" parameterType="Long">
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>

ruoyi-system/src/main/resources/mapper/system/SysUserDeptMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.SysUserDeptMapper">
+    
+    <resultMap type="SysUserDept" id="SysUserDeptResult">
+        <result property="userId"    column="user_id"    />
+        <result property="deptId"    column="dept_id"    />
+    </resultMap>
+
+    <sql id="selectSysUserDeptVo">
+        select user_id, dept_id from sys_user_dept
+    </sql>
+
+    <select id="selectSysUserDeptList" parameterType="SysUserDept" resultMap="SysUserDeptResult">
+        <include refid="selectSysUserDeptVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectSysUserDeptByUserId" parameterType="Long" resultMap="SysUserDeptResult">
+        <include refid="selectSysUserDeptVo"/>
+        where user_id = #{userId}
+    </select>
+        
+    <insert id="insertSysUserDept" parameterType="SysUserDept">
+        insert into sys_user_dept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysUserDept" parameterType="SysUserDept">
+        update sys_user_dept
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="deleteSysUserDeptByUserId" parameterType="Long">
+        delete from sys_user_dept where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteSysUserDeptByUserIds" parameterType="String">
+        delete from sys_user_dept where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -7,6 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="SysUser" id="SysUserResult">
         <id     property="userId"       column="user_id"      />
         <result property="deptId"       column="dept_id"      />
+
+		<result property="openId"     column="open_id"    />
+
         <result property="userName"     column="user_name"    />
         <result property="nickName"     column="nick_name"    />
         <result property="email"        column="email"        />
@@ -47,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.open_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -57,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.open_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
@@ -86,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.open_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -103,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id,u.open_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -146,11 +149,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.phonenumber = #{phone} and u.del_flag = '0'
 	</select>
+	<select id="getByOpenId" resultMap="SysUserResult" parameterType="String">
+		<include refid="selectUserVo"/>
+		where u.open_id = #{openId}
+	</select>
 
-    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
- 			<if test="userId != null and userId != 0">user_id,</if>
+ 			<!--<if test="userId != null and userId != 0">user_id,</if>-->
  			<if test="deptId != null and deptId != 0">dept_id,</if>
+			<if test="openId != null and openId != ''">open_id,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
  			<if test="nickName != null and nickName != ''">nick_name,</if>
  			<if test="email != null and email != ''">email,</if>
@@ -163,9 +171,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
  		)values(
- 			<if test="userId != null and userId != ''">#{userId},</if>
- 			<if test="deptId != null and deptId != ''">#{deptId},</if>
- 			<if test="userName != null and userName != ''">#{userName},</if>
+ 			<!--<if test="userId != null and userId != ''">#{userId},</if>-->
+ 			<if test="deptId != null and deptId != 0">#{deptId},</if>
+			<if test="openId != null and openId != ''">#{openId},</if>
+			<if test="userName != null and userName != ''">#{userName},</if>
  			<if test="nickName != null and nickName != ''">#{nickName},</if>
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="avatar != null and avatar != ''">#{avatar},</if>
@@ -183,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+			<if test="openId != null and openId != ''">open_id = #{openId},</if>
  			<if test="userName != null and userName != ''">user_name = #{userName},</if>
  			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
  			<if test="email != null ">email = #{email},</if>

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

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.ZhxyShyjMapper">
+    
+    <resultMap type="ZhxyShyj" id="ZhxyShyjResult">
+        <result property="id"    column="id"    />
+        <result property="dataId"    column="data_id"    />
+        <result property="type"    column="type"    />
+        <result property="auditId"    column="audit_id"    />
+        <result property="auditUser"    column="audit_user"    />
+        <result property="shjg"    column="shjg"    />
+        <result property="shyj"    column="shyj"    />
+        <result property="shsj"    column="shsj"    />
+        <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="selectZhxyShyjVo">
+        select id, data_id, type, audit_id, audit_user, shjg, shyj, shsj, create_by, create_time, update_by, update_time, remark from zhxy_shyj
+    </sql>
+
+    <select id="selectZhxyShyjList" parameterType="ZhxyShyj" resultMap="ZhxyShyjResult">
+        <include refid="selectZhxyShyjVo"/>
+        <where>  
+            <if test="dataId != null "> and data_id = #{dataId}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="auditId != null "> and audit_id = #{auditId}</if>
+            <if test="auditUser != null  and auditUser != ''"> and audit_user = #{auditUser}</if>
+            <if test="shjg != null  and shjg != ''"> and shjg = #{shjg}</if>
+            <if test="shyj != null  and shyj != ''"> and shyj = #{shyj}</if>
+            <if test="shsj != null "> and shsj = #{shsj}</if>
+        </where>
+    </select>
+    
+    <select id="selectZhxyShyjById" parameterType="Long" resultMap="ZhxyShyjResult">
+        <include refid="selectZhxyShyjVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertZhxyShyj" parameterType="ZhxyShyj" useGeneratedKeys="true" keyProperty="id">
+        insert into zhxy_shyj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dataId != null">data_id,</if>
+            <if test="type != null">type,</if>
+            <if test="auditId != null">audit_id,</if>
+            <if test="auditUser != null ">audit_user,</if>
+            <if test="shjg != null and shjg != ''">shjg,</if>
+            <if test="shyj != null">shyj,</if>
+            <if test="shsj != null">shsj,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dataId != null">#{dataId},</if>
+            <if test="type != null">#{type},</if>
+            <if test="auditId != null">#{auditId},</if>
+            <if test="auditUser != null">#{auditUser},</if>
+            <if test="shjg != null and shjg != ''">#{shjg},</if>
+            <if test="shyj != null">#{shyj},</if>
+            <if test="shsj != null">#{shsj},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZhxyShyj" parameterType="ZhxyShyj">
+        update zhxy_shyj
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dataId != null">data_id = #{dataId},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="auditId != null">audit_id = #{auditId},</if>
+            <if test="auditUser != null and auditUser != ''">audit_user = #{auditUser},</if>
+            <if test="shjg != null and shjg != ''">shjg = #{shjg},</if>
+            <if test="shyj != null">shyj = #{shyj},</if>
+            <if test="shsj != null">shsj = #{shsj},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteZhxyShyjById" parameterType="Long">
+        delete from zhxy_shyj where id = #{id}
+    </delete>
+
+    <delete id="deleteZhxyShyjByIds" parameterType="String">
+        delete from zhxy_shyj where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>