Administrator hace 1 año
padre
commit
9d9a7b6357
Se han modificado 100 ficheros con 12129 adiciones y 0 borrados
  1. 112 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/course/CourseChangeController.java
  2. 110 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/course/CourseTableController.java
  3. 96 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/course/CourseTableTimeController.java
  4. 109 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/formal/FormalParentsStudentController.java
  5. 113 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/formal/FormalTeacherClassController.java
  6. 107 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentInfoController.java
  7. 107 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentInfoOldController.java
  8. 97 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentLiveOldController.java
  9. 94 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/StudentMindOldController.java
  10. 98 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/info/TeacherInfoController.java
  11. 136 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/notice/XiaoyuanInfoController.java
  12. 4 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterAll.java
  13. 92 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterParentsController.java
  14. 94 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterParentsStudentController.java
  15. 105 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterSchoolController.java
  16. 98 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterSchoolFileController.java
  17. 97 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterTeacherClassController.java
  18. 95 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterTeacherController.java
  19. 98 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/SysUserDeptController.java
  20. 98 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/shyj/ZhxyShyjController.java
  21. 157 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/socre/ScoreDataController.java
  22. 105 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/RecordLeaveController.java
  23. 109 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/XiakeConfigController.java
  24. 117 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/XiaoyuanNoticeController.java
  25. 347 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CourseChange.java
  26. 344 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CourseTable.java
  27. 293 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CourseTableTime.java
  28. 56 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/FlowProcDefDto.java
  29. 243 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RecordLeave.java
  30. 104 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RegisterParents.java
  31. 230 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RegisterParentsStudent.java
  32. 153 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RegisterSchool.java
  33. 104 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RegisterSchoolFile.java
  34. 165 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RegisterTeacher.java
  35. 98 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RegisterTeacherClass.java
  36. 451 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentInfo.java
  37. 450 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentInfoOld.java
  38. 179 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentLiveOld.java
  39. 180 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/StudentMindOld.java
  40. 332 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/TeacherInfo.java
  41. 109 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/XiakeConfig.java
  42. 261 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/XiaoyuanNotice.java
  43. 144 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/ZhxyShyj.java
  44. 194 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/notice/InfoPinglun.java
  45. 255 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/notice/XiaoyuanInfo.java
  46. 168 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/ScoreData.java
  47. 300 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/ScoreDataDetails.java
  48. 67 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CourseChangeMapper.java
  49. 65 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CourseTableMapper.java
  50. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CourseTableTimeMapper.java
  51. 22 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/FlowDeployMapper.java
  52. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/FormalParentsStudentMapper.java
  53. 66 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/FormalTeacherClassMapper.java
  54. 63 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RecordLeaveMapper.java
  55. 66 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterParentsMapper.java
  56. 72 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterParentsStudentMapper.java
  57. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterSchoolFileMapper.java
  58. 70 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterSchoolMapper.java
  59. 66 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterTeacherClassMapper.java
  60. 69 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterTeacherMapper.java
  61. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentInfoMapper.java
  62. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentInfoOldMapper.java
  63. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentLiveOldMapper.java
  64. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentMindOldMapper.java
  65. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/TeacherInfoMapper.java
  66. 78 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/XiakeConfigMapper.java
  67. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/XiaoyuanNoticeMapper.java
  68. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/ZhxyShyjMapper.java
  69. 102 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/notice/XiaoyuanInfoMapper.java
  70. 111 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/score/ScoreDataMapper.java
  71. 18 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAppletService.java
  72. 67 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICourseChangeService.java
  73. 65 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICourseTableService.java
  74. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICourseTableTimeService.java
  75. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFormalParentsStudentService.java
  76. 70 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFormalTeacherClassService.java
  77. 70 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRecordLeaveService.java
  78. 63 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterParentsService.java
  79. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterParentsStudentService.java
  80. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterSchoolFileService.java
  81. 65 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterSchoolService.java
  82. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterTeacherClassService.java
  83. 63 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterTeacherService.java
  84. 66 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentInfoOldService.java
  85. 65 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentInfoService.java
  86. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentLiveOldService.java
  87. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IStudentMindOldService.java
  88. 63 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ITeacherInfoService.java
  89. 76 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IXiakeConfigService.java
  90. 64 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IXiaoyuanNoticeService.java
  91. 62 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IZhxyShyjService.java
  92. 320 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AppletServiceImpl.java
  93. 212 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseChangeServiceImpl.java
  94. 304 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseTableServiceImpl.java
  95. 97 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseTableTimeServiceImpl.java
  96. 119 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FormalParentsStudentServiceImpl.java
  97. 138 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FormalTeacherClassServiceImpl.java
  98. 188 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RecordLeaveServiceImpl.java
  99. 150 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterParentsServiceImpl.java
  100. 129 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterParentsStudentServiceImpl.java

+ 112 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/course/CourseChangeController.java

@@ -0,0 +1,112 @@
+package org.dromara.system.controller.course;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.CourseChange;
+import org.dromara.system.service.ICourseChangeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * 调课Controller
+ *
+ * @author ruoyi
+ * @date 2023-06-02
+ */
+@RestController
+@RequestMapping("/course/change")
+public class CourseChangeController extends BaseController
+{
+    @Autowired
+    private ICourseChangeService courseChangeService;
+
+    /**
+     * 查询调课列表
+     */
+    @SaCheckPermission("@ss.hasPermi('course:change:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CourseChange courseChange)
+    {
+        startPage();
+        List<CourseChange> list = courseChangeService.selectCourseChangeList(courseChange);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询调课列表(与课表一起)
+     */
+    @GetMapping("/list/class")
+    public TableDataInfo courseList(CourseChange courseChange)
+    {
+        startPage();
+        List<CourseChange> list = courseChangeService.courseList(courseChange);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 导出调课列表
+     */
+    @SaCheckPermission("@ss.hasPermi('course:change:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CourseChange courseChange)
+    {
+        List<CourseChange> list = courseChangeService.selectCourseChangeList(courseChange);
+        ExcelUtil<CourseChange> util = new ExcelUtil<CourseChange>(CourseChange.class);
+        util.exportExcel(response, list, "调课数据");
+    }
+
+    /**
+     * 获取调课详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('course:change:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(courseChangeService.selectCourseChangeById(id));
+    }
+
+    /**
+     * 新增调课
+     */
+    @SaCheckPermission("@ss.hasPermi('course:change:add')")
+    @PostMapping
+    public AjaxResult add(@RequestBody CourseChange courseChange)
+    {
+        return courseChangeService.insertCourseChange(courseChange);
+    }
+
+    /**
+     * 修改调课
+     */
+    @SaCheckPermission("@ss.hasPermi('course:change:edit')")
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody CourseChange courseChange)
+    {
+        return toAjax(courseChangeService.updateCourseChange(courseChange));
+    }
+
+
+    /**
+     * 回复调课
+     */
+    @SaCheckPermission("@ss.hasPermi('course:change:reply')")
+    @GetMapping("/reply")
+    public AjaxResult reply(CourseChange courseChange)
+    {
+        return courseChangeService.updateCourseChangeReply(courseChange);
+    }
+
+    /**
+     * 删除调课
+     */
+    @SaCheckPermission("@ss.hasPermi('course:change:remove')")
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(courseChangeService.deleteCourseChangeByIds(ids));
+    }
+}

+ 110 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/course/CourseTableController.java

@@ -0,0 +1,110 @@
+package org.dromara.system.controller.course;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.CourseTable;
+import com.ruoyi.system.service.ICourseTableService;
+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-24
+ */
+@RestController
+@RequestMapping("/course/table")
+public class CourseTableController extends BaseController
+{
+    @Autowired
+    private ICourseTableService courseTableService;
+
+    /**
+     * 查询课程列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CourseTable courseTable)
+    {
+        startPage();
+        List<CourseTable> list = courseTableService.selectCourseTableList(courseTable);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出课程列表
+     */
+    @PreAuthorize("@ss.hasPermi('course:table:export')")
+    @Log(title = "课程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CourseTable courseTable)
+    {
+        List<CourseTable> list = courseTableService.selectCourseTableList(courseTable);
+        ExcelUtil<CourseTable> util = new ExcelUtil<CourseTable>(CourseTable.class);
+        util.exportExcel(response, list, "课程数据");
+    }
+
+    /**
+     * 获取课程详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(courseTableService.selectCourseTableById(id));
+    }
+
+    /**
+     * 新增课程
+     */
+    @PreAuthorize("@ss.hasPermi('course:table:add')")
+    @Log(title = "课程", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CourseTable courseTable)
+    {
+        return courseTableService.insertCourseTable(courseTable);
+    }
+
+    /**
+     * 修改课程
+     */
+    @PreAuthorize("@ss.hasPermi('course:table:edit')")
+    @Log(title = "课程", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody CourseTable courseTable)
+    {
+        return toAjax(courseTableService.updateCourseTable(courseTable));
+    }
+
+    /**
+     * 删除课程
+     */
+    @PreAuthorize("@ss.hasPermi('course:table:remove')")
+    @Log(title = "课程", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(courseTableService.deleteCourseTableByIds(ids));
+    }
+
+
+    /**
+     * app查询班级授课老师和名称
+     * @param schoolId
+     * @param classId
+     * @return
+     */
+    @GetMapping(value = "/now")
+    public AjaxResult now(Long schoolId, Long classId)
+    {
+        return courseTableService.now(schoolId,classId);
+    }
+
+}

+ 96 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/course/CourseTableTimeController.java

@@ -0,0 +1,96 @@
+package org.dromara.system.controller.course;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.CourseTableTime;
+import com.ruoyi.system.service.ICourseTableTimeService;
+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-24
+ */
+@RestController
+@RequestMapping("/course/time")
+public class CourseTableTimeController extends BaseController
+{
+    @Autowired
+    private ICourseTableTimeService courseTableTimeService;
+
+    /**
+     * 查询课程-时间列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CourseTableTime courseTableTime)
+    {
+        startPage();
+        List<CourseTableTime> list = courseTableTimeService.selectCourseTableTimeList(courseTableTime);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出课程-时间列表
+     */
+    @PreAuthorize("@ss.hasPermi('course:time:export')")
+    @Log(title = "课程-时间", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CourseTableTime courseTableTime)
+    {
+        List<CourseTableTime> list = courseTableTimeService.selectCourseTableTimeList(courseTableTime);
+        ExcelUtil<CourseTableTime> util = new ExcelUtil<CourseTableTime>(CourseTableTime.class);
+        util.exportExcel(response, list, "课程-时间数据");
+    }
+
+    /**
+     * 获取课程-时间详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(courseTableTimeService.selectCourseTableTimeById(id));
+    }
+
+    /**
+     * 新增课程-时间
+     */
+    @PreAuthorize("@ss.hasPermi('course:time:add')")
+    @Log(title = "课程-时间", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CourseTableTime courseTableTime)
+    {
+        return toAjax(courseTableTimeService.insertCourseTableTime(courseTableTime));
+    }
+
+    /**
+     * 修改课程-时间
+     */
+    @PreAuthorize("@ss.hasPermi('course:time:edit')")
+    @Log(title = "课程-时间", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody CourseTableTime courseTableTime)
+    {
+        return toAjax(courseTableTimeService.updateCourseTableTime(courseTableTime));
+    }
+
+    /**
+     * 删除课程-时间
+     */
+    @PreAuthorize("@ss.hasPermi('course:time:remove')")
+    @Log(title = "课程-时间", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(courseTableTimeService.deleteCourseTableTimeByIds(ids));
+    }
+}

+ 109 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/formal/FormalParentsStudentController.java

@@ -0,0 +1,109 @@
+package org.dromara.system.controller.formal;
+
+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.FormalParentsStudent;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.IFormalParentsStudentService;
+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-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);
+    }
+
+    /**
+     * 查询家长-学生(审核通过之后数据)列表不分页
+     */
+    @GetMapping("noPage/list")
+    public TableDataInfo noPage(FormalParentsStudent formalParentsStudent)
+    {
+
+        List<FormalParentsStudent> list = formalParentsStudentService.selectFormalParentsStudentListNoPage(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));
+    }
+}

+ 113 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/formal/FormalTeacherClassController.java

@@ -0,0 +1,113 @@
+package org.dromara.system.controller.formal;
+
+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.FormalTeacherClass;
+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.system.service.IFormalTeacherClassService;
+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-30
+ */
+@RestController
+@RequestMapping("/formal/class")
+public class FormalTeacherClassController extends BaseController {
+    @Autowired
+    private IFormalTeacherClassService formalTeacherClassService;
+
+    /**
+     * 查询老师-班级(学科)(审核通过之后数据)列表
+     */
+    @PreAuthorize("@ss.hasPermi('formal:class:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FormalTeacherClass formalTeacherClass) {
+        startPage();
+        List<FormalTeacherClass> list = formalTeacherClassService.selectFormalTeacherClassList(formalTeacherClass);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出老师-班级(学科)(审核通过之后数据)列表
+     */
+    @PreAuthorize("@ss.hasPermi('formal:class:export')")
+    @Log(title = "老师-班级(学科)(审核通过之后数据)", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    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, "老师-班级(学科)(审核通过之后数据)数据");
+    }
+
+    /**
+     * 获取老师-班级(学科)(审核通过之后数据)详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('formal:class:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(formalTeacherClassService.selectFormalTeacherClassById(id));
+    }
+
+    /**
+     * 新增老师-班级(学科)(审核通过之后数据)
+     */
+    @PreAuthorize("@ss.hasPermi('formal:class:add')")
+    @Log(title = "老师-班级(学科)(审核通过之后数据)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FormalTeacherClass formalTeacherClass) {
+        return toAjax(formalTeacherClassService.insertFormalTeacherClass(formalTeacherClass));
+    }
+
+    /**
+     * 修改老师-班级(学科)(审核通过之后数据)
+     */
+    @PreAuthorize("@ss.hasPermi('formal:class:edit')")
+    @Log(title = "老师-班级(学科)(审核通过之后数据)", businessType = BusinessType.UPDATE)
+    @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('formal:class:remove')")
+    @Log(title = "老师-班级(学科)(审核通过之后数据)", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(formalTeacherClassService.deleteFormalTeacherClassByIds(ids));
+    }
+
+    /***
+     * 查询老师信息(用于档案信息新增)
+     */
+    @GetMapping("/noPage/list")
+    public TableDataInfo noPage(FormalTeacherClass formalTeacherClass) {
+        List<FormalTeacherClass> list = formalTeacherClassService.selectFormalTeacherClassListNoPage(formalTeacherClass);
+        return getDataTable(list);
+    }
+
+}

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

@@ -0,0 +1,107 @@
+package org.dromara.system.controller.info;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.StudentInfo;
+import com.ruoyi.system.service.IStudentInfoService;
+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-07-21
+ */
+@RestController
+@RequestMapping("/student/info")
+public class StudentInfoController extends BaseController
+{
+    @Autowired
+    private IStudentInfoService studentInfoService;
+
+    /**
+     * 查询学生档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StudentInfo studentInfo)
+    {
+        startPage();
+        List<StudentInfo> list = studentInfoService.selectStudentInfoList(studentInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学生档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:export')")
+    @Log(title = "学生档案信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, StudentInfo studentInfo)
+    {
+        List<StudentInfo> list = studentInfoService.selectStudentInfoList(studentInfo);
+        ExcelUtil<StudentInfo> util = new ExcelUtil<StudentInfo>(StudentInfo.class);
+        util.exportExcel(response, list, "学生档案信息数据");
+    }
+
+    /**
+     * 获取学生档案信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(studentInfoService.selectStudentInfoById(id));
+    }
+
+    /**
+     * 新增学生档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:add')")
+    @Log(title = "学生档案信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StudentInfo studentInfo)
+    {
+        return studentInfoService.insertStudentInfo(studentInfo);
+    }
+
+    /**
+     * 修改学生档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:edit')")
+    @Log(title = "学生档案信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/put")
+    public AjaxResult edit(@RequestBody StudentInfo studentInfo)
+    {
+        return toAjax(studentInfoService.updateStudentInfo(studentInfo));
+    }
+
+    /**
+     * 删除学生档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:remove')")
+    @Log(title = "学生档案信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(studentInfoService.deleteStudentInfoByIds(ids));
+    }
+
+    /**
+     * 统计学生档案信息
+     */
+    @GetMapping("/statistics")
+    public AjaxResult statistics(StudentInfo studentInfo)
+    {
+        return studentInfoService.statistics(studentInfo);
+    }
+}

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

@@ -0,0 +1,107 @@
+package org.dromara.system.controller.info;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.StudentInfoOld;
+import com.ruoyi.system.domain.StudentLiveOld;
+import com.ruoyi.system.service.IStudentInfoOldService;
+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-07-28
+ */
+@RestController
+@RequestMapping("/student/old")
+public class StudentInfoOldController extends BaseController
+{
+    @Autowired
+    private IStudentInfoOldService studentInfoOldService;
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(StudentInfoOld studentInfoOld)
+    {
+        List<StudentInfoOld> list = studentInfoOldService.selectStudentInfoOldList(studentInfoOld);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 查询学生档案历史信息列表
+     */
+    @GetMapping("/echarts")
+    public AjaxResult echarts(StudentLiveOld studentLiveOld)
+    {
+        return studentInfoOldService.selectStudentInfoOldListEcharts(studentLiveOld);
+    }
+
+    /**
+     * 导出学生档案历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('student:old:export')")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, StudentInfoOld studentInfoOld)
+    {
+        List<StudentInfoOld> list = studentInfoOldService.selectStudentInfoOldList(studentInfoOld);
+        ExcelUtil<StudentInfoOld> util = new ExcelUtil<StudentInfoOld>(StudentInfoOld.class);
+        util.exportExcel(response, list, "学生档案历史信息数据");
+    }
+
+    /**
+     * 获取学生档案历史信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:old:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(studentInfoOldService.selectStudentInfoOldById(id));
+    }
+
+    /**
+     * 新增学生档案历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:old:add')")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StudentInfoOld studentInfoOld)
+    {
+        return toAjax(studentInfoOldService.insertStudentInfoOld(studentInfoOld));
+    }
+
+    /**
+     * 修改学生档案历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:old:edit')")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody StudentInfoOld studentInfoOld)
+    {
+        return toAjax(studentInfoOldService.updateStudentInfoOld(studentInfoOld));
+    }
+
+    /**
+     * 删除学生档案历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:old:remove')")
+    @Log(title = "学生档案历史信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(studentInfoOldService.deleteStudentInfoOldByIds(ids));
+    }
+}

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

@@ -0,0 +1,97 @@
+package org.dromara.system.controller.info;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.StudentLiveOld;
+import com.ruoyi.system.service.IStudentLiveOldService;
+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-08-03
+ */
+@RestController
+@RequestMapping("/live/old")
+public class StudentLiveOldController extends BaseController
+{
+    @Autowired
+    private IStudentLiveOldService studentLiveOldService;
+
+    /**
+     * 查询学生生活历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StudentLiveOld studentLiveOld)
+    {
+        List<StudentLiveOld> list = studentLiveOldService.selectStudentLiveOldList(studentLiveOld);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学生生活历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:export')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, StudentLiveOld studentLiveOld)
+    {
+        List<StudentLiveOld> list = studentLiveOldService.selectStudentLiveOldList(studentLiveOld);
+        ExcelUtil<StudentLiveOld> util = new ExcelUtil<StudentLiveOld>(StudentLiveOld.class);
+        util.exportExcel(response, list, "学生生活历史信息数据");
+    }
+
+    /**
+     * 获取学生生活历史信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:query')")
+    @GetMapping(value = "/{liveId}")
+    public AjaxResult getInfo(@PathVariable("liveId") Long liveId)
+    {
+        return success(studentLiveOldService.selectStudentLiveOldByLiveId(liveId));
+    }
+
+    /**
+     * 新增学生生活历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:add')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StudentLiveOld studentLiveOld)
+    {
+        return toAjax(studentLiveOldService.insertStudentLiveOld(studentLiveOld));
+    }
+
+    /**
+     * 修改学生生活历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:edit')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody StudentLiveOld studentLiveOld)
+    {
+        return toAjax(studentLiveOldService.updateStudentLiveOld(studentLiveOld));
+    }
+
+    /**
+     * 删除学生生活历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:remove')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{liveIds}")
+    public AjaxResult remove(@PathVariable Long[] liveIds)
+    {
+        return toAjax(studentLiveOldService.deleteStudentLiveOldByLiveIds(liveIds));
+    }
+}

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

@@ -0,0 +1,94 @@
+package org.dromara.system.controller.info;
+
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.StudentMindOld;
+import org.dromara.system.service.IStudentMindOldService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 学生心理健康历史信息Controller
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+@RestController
+@RequestMapping("/mind/old")
+public class StudentMindOldController extends BaseController
+{
+    @Autowired
+    private IStudentMindOldService studentMindOldService;
+
+    /**
+     * 查询学生心理健康历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StudentMindOld studentMindOld)
+    {
+        List<StudentMindOld> list = studentMindOldService.selectStudentMindOldList(studentMindOld);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学生心理健康历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:export')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, StudentMindOld studentMindOld)
+    {
+        List<StudentMindOld> list = studentMindOldService.selectStudentMindOldList(studentMindOld);
+        ExcelUtil<StudentMindOld> util = new ExcelUtil<StudentMindOld>(StudentMindOld.class);
+        util.exportExcel(response, list, "学生心理健康历史信息数据");
+    }
+
+    /**
+     * 获取学生心理健康历史信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:query')")
+    @GetMapping(value = "/{mindId}")
+    public AjaxResult getInfo(@PathVariable("mindId") Long mindId)
+    {
+        return success(studentMindOldService.selectStudentMindOldByMindId(mindId));
+    }
+
+    /**
+     * 新增学生心理健康历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:add')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StudentMindOld studentMindOld)
+    {
+        return toAjax(studentMindOldService.insertStudentMindOld(studentMindOld));
+    }
+
+    /**
+     * 修改学生心理健康历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:edit')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody StudentMindOld studentMindOld)
+    {
+        return toAjax(studentMindOldService.updateStudentMindOld(studentMindOld));
+    }
+
+    /**
+     * 删除学生心理健康历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:remove')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{mindIds}")
+    public AjaxResult remove(@PathVariable Long[] mindIds)
+    {
+        return toAjax(studentMindOldService.deleteStudentMindOldByMindIds(mindIds));
+    }
+}

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

@@ -0,0 +1,98 @@
+package org.dromara.system.controller.info;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.TeacherInfo;
+import com.ruoyi.system.service.ITeacherInfoService;
+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-07-24
+ */
+@RestController
+@RequestMapping("/teacher/info")
+public class TeacherInfoController extends BaseController
+{
+    @Autowired
+    private ITeacherInfoService teacherInfoService;
+
+    /**
+     * 查询老师档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TeacherInfo teacherInfo)
+    {
+        startPage();
+        List<TeacherInfo> list = teacherInfoService.selectTeacherInfoList(teacherInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出老师档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:export')")
+    @Log(title = "老师档案信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TeacherInfo teacherInfo)
+    {
+        List<TeacherInfo> list = teacherInfoService.selectTeacherInfoList(teacherInfo);
+        ExcelUtil<TeacherInfo> util = new ExcelUtil<TeacherInfo>(TeacherInfo.class);
+        util.exportExcel(response, list, "老师档案信息数据");
+    }
+
+    /**
+     * 获取老师档案信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(teacherInfoService.selectTeacherInfoById(id));
+    }
+
+    /**
+     * 新增老师档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:add')")
+    @Log(title = "老师档案信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TeacherInfo teacherInfo)
+    {
+        return teacherInfoService.insertTeacherInfo(teacherInfo);
+    }
+
+    /**
+     * 修改老师档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:edit')")
+    @Log(title = "老师档案信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/put")
+    public AjaxResult edit(@RequestBody TeacherInfo teacherInfo)
+    {
+        return toAjax(teacherInfoService.updateTeacherInfo(teacherInfo));
+    }
+
+    /**
+     * 删除老师档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:remove')")
+    @Log(title = "老师档案信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(teacherInfoService.deleteTeacherInfoByIds(ids));
+    }
+}

+ 136 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/notice/XiaoyuanInfoController.java

@@ -0,0 +1,136 @@
+package org.dromara.system.controller.notice;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.notice.InfoPinglun;
+import com.ruoyi.system.domain.notice.XiaoyuanInfo;
+import com.ruoyi.system.service.notice.IXiaoyuanInfoService;
+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;
+
+/**
+ * 校园安全信息Controller
+ *
+ * @author boman
+ * @date 2023-08-01
+ */
+@RestController
+@RequestMapping("/system/xiaoYuanInfo")
+public class XiaoyuanInfoController extends BaseController
+{
+    @Autowired
+    private IXiaoyuanInfoService xiaoyuanInfoService;
+
+    /**
+     * 查询校园安全信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:xiaoYuanInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(XiaoyuanInfo xiaoyuanInfo)
+    {
+        List<XiaoyuanInfo> list = xiaoyuanInfoService.selectXiaoyuanInfoList(xiaoyuanInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出校园安全信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:xiaoYuanInfo:export')")
+    @Log(title = "校园安全信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, XiaoyuanInfo xiaoyuanInfo)
+    {
+        List<XiaoyuanInfo> list = xiaoyuanInfoService.selectXiaoyuanInfoList(xiaoyuanInfo);
+        ExcelUtil<XiaoyuanInfo> util = new ExcelUtil<XiaoyuanInfo>(XiaoyuanInfo.class);
+        util.exportExcel(response, list, "校园安全信息数据");
+    }
+
+    /**
+     * 获取校园安全信息详细信息
+     */
+    @GetMapping(value = "/{infoId}")
+    public AjaxResult getInfo(@PathVariable("infoId") Long infoId)
+    {
+        return success(xiaoyuanInfoService.selectXiaoyuanInfoByInfoId(infoId));
+    }
+
+    /**
+     * 新增校园安全信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:xiaoYuanInfo:add')")
+    @Log(title = "校园安全信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody XiaoyuanInfo xiaoyuanInfo)
+    {
+        return toAjax(xiaoyuanInfoService.insertXiaoyuanInfo(xiaoyuanInfo));
+    }
+
+    /**
+     * 修改校园安全信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:xiaoYuanInfo:edit')")
+    @Log(title = "校园安全信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody XiaoyuanInfo xiaoyuanInfo)
+    {
+        return toAjax(xiaoyuanInfoService.updateXiaoyuanInfo(xiaoyuanInfo));
+    }
+
+    /**
+     * 删除校园安全信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:xiaoYuanInfo:remove')")
+    @Log(title = "校园安全信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{infoIds}")
+    public AjaxResult remove(@PathVariable Long[] infoIds)
+    {
+        return toAjax(xiaoyuanInfoService.deleteXiaoyuanInfoByInfoIds(infoIds));
+    }
+
+
+    /**
+     * 新增校园安全信息评论
+     */
+    @PostMapping("/pingLun")
+    public AjaxResult pingLun(@RequestBody InfoPinglun infoPinglun)
+    {
+        return toAjax(xiaoyuanInfoService.insertInfoPingLun(infoPinglun));
+    }
+
+    /**
+     * 删除校园安全信息评论
+     */
+    @PostMapping("/delete/pingLun")
+    public AjaxResult deletePingLun(@RequestBody InfoPinglun infoPinglun)
+    {
+        return toAjax(xiaoyuanInfoService.deletePingLun(infoPinglun));
+    }
+
+    /**
+     * 新增校园安全信息点赞接口/取消点赞
+     */
+    @PostMapping("/dianZan")
+    public AjaxResult dianZan(@RequestBody XiaoyuanInfo xiaoyuanInfo)
+    {
+        return xiaoyuanInfoService.dianZan(xiaoyuanInfo);
+    }
+
+    /**
+     * 新增校园安全信息转发接口
+     */
+    @PostMapping("/zhuanFa")
+    public AjaxResult zhuanFa(@RequestBody XiaoyuanInfo xiaoyuanInfo)
+    {
+        return xiaoyuanInfoService.zhuanFa(xiaoyuanInfo);
+    }
+
+}

+ 4 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterAll.java

@@ -0,0 +1,4 @@
+package org.dromara.system.controller.register;
+
+public class RegisterAll {
+}

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

@@ -0,0 +1,92 @@
+package org.dromara.system.controller.register;
+
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.RegisterParents;
+import org.dromara.system.service.IRegisterParentsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 注册-家长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, "注册-家长数据");
+    }
+
+    /**
+     * 获取注册-家长详细信息
+     */
+    @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));
+    }
+}

+ 94 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterParentsStudentController.java

@@ -0,0 +1,94 @@
+package org.dromara.system.controller.register;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.RegisterParentsStudent;
+import com.ruoyi.system.service.IRegisterParentsStudentService;
+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
+ */
+@RestController
+@RequestMapping("/register/student")
+public class RegisterParentsStudentController extends BaseController
+{
+    @Autowired
+    private IRegisterParentsStudentService registerParentsStudentService;
+
+    /**
+     * 查询注册-家长-学生列表
+     */
+    @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, "注册-家长-学生数据");
+    }
+
+    /**
+     * 获取注册-家长-学生详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(registerParentsStudentService.selectRegisterParentsStudentById(id));
+    }
+
+    /**
+     * 新增注册-家长-学生
+     */
+    @Log(title = "注册-家长-学生", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RegisterParentsStudent registerParentsStudent)
+    {
+        return toAjax(registerParentsStudentService.insertRegisterParentsStudent(registerParentsStudent));
+    }
+
+    /**
+     * 修改注册-家长-学生
+     */
+    @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));
+    }
+}

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

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.register;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.RegisterSchool;
+import com.ruoyi.system.service.IRegisterSchoolService;
+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-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, "注册-学校数据");
+    }
+
+    /**
+     * 获取注册-学校详细信息
+     */
+    @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 phonenumber)
+    {
+        return registerSchoolService.queryInfo(phonenumber);
+    }
+
+}

+ 98 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/RegisterSchoolFileController.java

@@ -0,0 +1,98 @@
+package org.dromara.system.controller.register;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.RegisterSchoolFile;
+import com.ruoyi.system.service.IRegisterSchoolFileService;
+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-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));
+    }
+}

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

@@ -0,0 +1,97 @@
+package org.dromara.system.controller.register;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.RegisterTeacherClass;
+import com.ruoyi.system.service.IRegisterTeacherClassService;
+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
+ */
+@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, "注册-老师-班级(学科)数据");
+    }
+
+    /**
+     * 获取注册-老师-班级(学科)详细信息
+     */
+    @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));
+    }
+}

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

@@ -0,0 +1,95 @@
+package org.dromara.system.controller.register;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.RegisterTeacher;
+import com.ruoyi.system.service.IRegisterTeacherService;
+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
+ */
+@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));
+    }
+}

+ 98 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/register/SysUserDeptController.java

@@ -0,0 +1,98 @@
+package org.dromara.system.controller.register;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysUserDept;
+import com.ruoyi.system.service.ISysUserDeptService;
+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-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));
+    }
+}

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

@@ -0,0 +1,98 @@
+package org.dromara.system.controller.shyj;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.ZhxyShyj;
+import com.ruoyi.system.service.IZhxyShyjService;
+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-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));
+    }
+}

+ 157 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/socre/ScoreDataController.java

@@ -0,0 +1,157 @@
+package org.dromara.system.controller.socre;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.score.ScoreData;
+import com.ruoyi.system.domain.score.ScoreDataDetails;
+import com.ruoyi.system.service.score.IScoreDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 成绩Controller
+ *
+ * @author boman
+ * @date 2023-07-20
+ */
+@RestController
+@RequestMapping("/score/data")
+public class ScoreDataController extends BaseController
+{
+    @Autowired
+    private IScoreDataService scoreDataService;
+
+    /**
+     * 查询成绩列表
+     */
+    @PreAuthorize("@ss.hasPermi('score:data:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ScoreData scoreData)
+    {
+        List<ScoreData> list = scoreDataService.selectScoreDataList(scoreData);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出成绩列表
+     */
+    @PreAuthorize("@ss.hasPermi('score:data:export')")
+    @Log(title = "成绩", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ScoreData scoreData)
+    {
+        List<ScoreData> list = scoreDataService.selectScoreDataList(scoreData);
+        ExcelUtil<ScoreData> util = new ExcelUtil<ScoreData>(ScoreData.class);
+        util.exportExcel(response, list, "成绩数据");
+    }
+
+    /**
+     * 获取成绩详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('score:data:query')")
+    @PostMapping("/query")
+    public AjaxResult getInfo(@RequestBody ScoreData scoreData)
+    {
+        return success(scoreDataService.selectScoreDataByScoreId(scoreData));
+    }
+
+
+    /**
+     * 新增成绩
+     */
+    @PreAuthorize("@ss.hasPermi('score:data:add')")
+    @Log(title = "成绩", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(ScoreData scoreData,MultipartFile file)throws Exception
+    {
+        if (file != null){
+            ExcelUtil<ScoreDataDetails> util = new ExcelUtil<ScoreDataDetails>(ScoreDataDetails.class);
+            List<ScoreDataDetails> scoreDataDetailsList = util.importExcel(file.getInputStream());
+            if (scoreDataDetailsList == null || scoreDataDetailsList.size() < 1){
+                return AjaxResult.error("不能导入空数据");
+            }
+            for (ScoreDataDetails scoreDataDetails : scoreDataDetailsList) {
+                int zongfen = scoreDataDetails.getZongfen();
+                if (zongfen < 0){
+                    return AjaxResult.error("总成绩不能有小于0的数据");
+                }
+            }
+            scoreData.setScoreDataDetailsList(scoreDataDetailsList);
+        }
+        return toAjax(scoreDataService.insertScoreData(scoreData));
+    }
+    /**
+     * 新增成绩
+     */
+    @PreAuthorize("@ss.hasPermi('score:data:add')")
+    @Log(title = "成绩", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody ScoreData scoreData)
+    {
+
+        return toAjax(scoreDataService.insertScoreData(scoreData));
+    }
+
+    /**
+     * 修改成绩
+     */
+    @PreAuthorize("@ss.hasPermi('score:data:edit')")
+    @Log(title = "成绩", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ScoreData scoreData)
+    {
+        return toAjax(scoreDataService.updateScoreData(scoreData));
+    }
+
+    /**
+     * 删除成绩
+     */
+    @PreAuthorize("@ss.hasPermi('score:data:remove')")
+    @Log(title = "成绩", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{scoreIds}")
+    public AjaxResult remove(@PathVariable Long[] scoreIds)
+    {
+        return toAjax(scoreDataService.deleteScoreDataByScoreIds(scoreIds));
+    }
+
+    /**
+     * 后台首页成绩统计排名
+     */
+    @PostMapping("/indexPaiMing")
+    public AjaxResult indexPaiMing(@RequestBody ScoreData scoreData)
+    {
+        List<ScoreDataDetails> scoreDataDetails = scoreDataService.indexPaiMing(scoreData);
+        return AjaxResult.success(scoreDataDetails);
+    }
+
+    /**
+     * 后台首页成绩统计分段人数饼图
+     */
+    @PostMapping("/indexBingTu")
+    public AjaxResult indexBingTu(@RequestBody ScoreData scoreData)
+    {
+        Map<String, Object> map = scoreDataService.indexBingTu(scoreData);
+        return AjaxResult.success(map);
+    }
+
+    /**
+     * 后台首页成绩统计分段人数折线图
+     */
+    @PostMapping("/indexZheXian")
+    public AjaxResult indexZheXian(@RequestBody ScoreData scoreData)
+    {
+        Map<String, Object> map = scoreDataService.indexZheXian(scoreData);
+        return AjaxResult.success(map);
+    }
+
+}

+ 105 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/RecordLeaveController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.system;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.RecordLeave;
+import com.ruoyi.system.service.IRecordLeaveService;
+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 boman
+ * @date 2023-08-08
+ */
+@RestController
+@RequestMapping("/system/leave")
+public class RecordLeaveController extends BaseController
+{
+    @Autowired
+    private IRecordLeaveService recordLeaveService;
+
+    /**
+     * 查询请假记录信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:leave:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(RecordLeave recordLeave)
+    {
+        List<RecordLeave> list = recordLeaveService.selectRecordLeaveList(recordLeave);
+        return getDataTable(list);
+    }
+    /**
+     * app请假记录数量通知
+     */
+    @PostMapping("/recordLeave")
+    public void recordLeave(RecordLeave recordLeave)
+    {
+        recordLeaveService.selectRecordLeaveNum(recordLeave);
+    }
+
+    /**
+     * 导出请假记录信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:leave:export')")
+    @Log(title = "请假记录信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RecordLeave recordLeave)
+    {
+        List<RecordLeave> list = recordLeaveService.selectRecordLeaveList(recordLeave);
+        ExcelUtil<RecordLeave> util = new ExcelUtil<RecordLeave>(RecordLeave.class);
+        util.exportExcel(response, list, "请假记录信息数据");
+    }
+
+    /**
+     * 获取请假记录信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:leave:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(recordLeaveService.selectRecordLeaveById(id));
+    }
+
+    /**
+     * 新增请假记录信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:leave:add')")
+    @Log(title = "请假记录信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody RecordLeave recordLeave)
+    {
+        return toAjax(recordLeaveService.insertRecordLeave(recordLeave));
+    }
+
+    /**
+     * 修改请假记录信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:leave:edit')")
+    @Log(title = "请假记录信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody RecordLeave recordLeave)
+    {
+        return toAjax(recordLeaveService.updateRecordLeave(recordLeave));
+    }
+
+    /**
+     * 删除请假记录信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:leave:remove')")
+    @Log(title = "请假记录信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(recordLeaveService.deleteRecordLeaveByIds(ids));
+    }
+}

+ 109 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/XiakeConfigController.java

@@ -0,0 +1,109 @@
+package org.dromara.system.controller.system;
+
+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.XiakeConfig;
+import com.ruoyi.system.service.IXiakeConfigService;
+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.*;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/xiaKeConfig")
+public class XiakeConfigController extends BaseController
+{
+    @Autowired
+    private IXiakeConfigService configService;
+
+
+    /**
+     * 根据参数编号获取详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:query')")
+    @GetMapping(value = "/{configId}")
+    public AjaxResult getInfo(@PathVariable Long configId)
+    {
+        return success(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名(班级id)查询参数值config_value(下课时间)
+     */
+    @PostMapping(value = "/configKey")
+    public AjaxResult getConfigKey(@Validated @RequestBody XiakeConfig config)
+    {
+        return success(configService.selectConfigByKey(config));
+    }
+    /**
+     * 根据参数键名修改参数值
+     */
+    @PostMapping(value = "/updateConfigKey")
+    public AjaxResult updateConfigKey(@Validated @RequestBody XiakeConfig config)
+    {
+        return success(configService.updateConfigValue(config));
+    }
+
+/*    *//**
+     * 新增参数配置
+     *//*
+    @PreAuthorize("@ss.hasPermi('system:config:add')")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody XiakeConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("新增参数'" + config.getConfigName() + "'失败,参数键名已存在");
+        }
+        config.setCreateBy(getUsername());
+        return toAjax(configService.insertConfig(config));
+    }*/
+
+/*    *//**
+     * 修改参数配置
+     *//*
+    @PreAuthorize("@ss.hasPermi('system:config:edit')")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody XiakeConfig config)
+    {
+        if (!configService.checkConfigKeyUnique(config))
+        {
+            return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在");
+        }
+        config.setUpdateBy(getUsername());
+        return toAjax(configService.updateConfig(config));
+    }*/
+
+/*    *//**
+     * 删除参数配置
+     *//*
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public AjaxResult remove(@PathVariable Long[] configIds)
+    {
+        configService.deleteConfigByIds(configIds);
+        return success();
+    }*/
+
+    /**
+     * 刷新参数缓存
+     */
+    @PreAuthorize("@ss.hasPermi('system:config:remove')")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public AjaxResult refreshCache()
+    {
+        configService.resetConfigCache();
+        return success();
+    }
+}

+ 117 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/XiaoyuanNoticeController.java

@@ -0,0 +1,117 @@
+package org.dromara.system.controller.system;
+
+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.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.XiaoyuanNotice;
+import com.ruoyi.system.service.IXiaoyuanNoticeService;
+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 boman
+ * @date 2023-06-05
+ */
+@RestController
+@RequestMapping("/xiaoYuan/notice")
+public class XiaoyuanNoticeController extends BaseController
+{
+    @Autowired
+    private IXiaoyuanNoticeService xiaoyuanNoticeService;
+
+    /**
+     * 查询校园新闻列表
+     */
+    @PreAuthorize("@ss.hasPermi('xiaoYuan:notice:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(XiaoyuanNotice xiaoyuanNotice)
+    {
+        List<XiaoyuanNotice> list = xiaoyuanNoticeService.selectXiaoyuanNoticeList(xiaoyuanNotice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 我的校园新闻列表
+     */
+    @GetMapping("/myList")
+    public TableDataInfo myList(XiaoyuanNotice xiaoyuanNotice)
+    {
+        startPage();
+        List<XiaoyuanNotice> list = xiaoyuanNoticeService.selectXiaoyuanNoticeMyList(xiaoyuanNotice);
+        return getDataTable(list);
+    }
+    /**
+     * 我的收藏
+     */
+    @GetMapping("/collect")
+    public TableDataInfo myCollect(XiaoyuanNotice xiaoyuanNotice)
+    {
+        startPage();
+        List<XiaoyuanNotice> list = xiaoyuanNoticeService.myCollect(xiaoyuanNotice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出校园新闻列表
+     */
+    @PreAuthorize("@ss.hasPermi('xiaoYuan:notice:export')")
+    @Log(title = "校园新闻", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, XiaoyuanNotice xiaoyuanNotice)
+    {
+        List<XiaoyuanNotice> list = xiaoyuanNoticeService.selectXiaoyuanNoticeList(xiaoyuanNotice);
+        ExcelUtil<XiaoyuanNotice> util = new ExcelUtil<XiaoyuanNotice>(XiaoyuanNotice.class);
+        util.exportExcel(response, list, "校园新闻数据");
+    }
+
+    /**
+     * 获取校园新闻详细信息
+     */
+    @GetMapping(value = "/{noticeId}")
+    public AjaxResult getInfo(@PathVariable("noticeId") Integer noticeId)
+    {
+        return success(xiaoyuanNoticeService.selectXiaoyuanNoticeByNoticeId(noticeId));
+    }
+
+    /**
+     * 新增校园新闻
+     */
+    @PreAuthorize("@ss.hasPermi('xiaoYuan:notice:add')")
+    @Log(title = "校园新闻", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody XiaoyuanNotice xiaoyuanNotice)
+    {
+        return toAjax(xiaoyuanNoticeService.insertXiaoyuanNotice(xiaoyuanNotice));
+    }
+
+    /**
+     * 修改校园新闻
+     */
+    @PreAuthorize("@ss.hasPermi('xiaoYuan:notice:edit')")
+    @Log(title = "校园新闻", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody XiaoyuanNotice xiaoyuanNotice)
+    {
+        return toAjax(xiaoyuanNoticeService.updateXiaoyuanNotice(xiaoyuanNotice));
+    }
+
+    /**
+     * 删除校园新闻
+     */
+    @PreAuthorize("@ss.hasPermi('xiaoYuan:notice:remove')")
+    @Log(title = "校园新闻", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{noticeIds}")
+    public AjaxResult remove(@PathVariable Integer[] noticeIds)
+    {
+        return toAjax(xiaoyuanNoticeService.deleteXiaoyuanNoticeByNoticeIds(noticeIds));
+    }
+}

+ 347 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CourseChange.java

@@ -0,0 +1,347 @@
+package org.dromara.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 调课对象 course_change
+ *
+ * @author ruoyi
+ * @date 2023-06-02
+ */
+public class CourseChange extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 学校id */
+    private Long schoolId;
+
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 申请人id */
+    @Excel(name = "申请人id")
+    private Long applyId;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /** 调课班级id */
+    @Excel(name = "调课班级id")
+    private Long subjectClassId;
+
+    /** 调课班级 */
+    @Excel(name = "调课班级")
+    private String subjectClass;
+
+    /** 调课科目 */
+    @Excel(name = "调课科目")
+    private String subject;
+
+    /** 调课科目是第几节课 */
+    @Excel(name = "调课科目是第几节课")
+    private String isNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调课科目的上课时间(yyyy-MM-dd)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date subjectTime;
+
+    /** 周几(调课科目的上课) */
+    @Excel(name = "周几(调课科目的上课)")
+    private String subjectWeek;
+
+    /** 被调科目老师 */
+    @Excel(name = "被调科目老师")
+    private String bePersonnel;
+
+    /** 被调科目老师Id */
+    @Excel(name = "被调科目老师Id")
+    private Long bePersonnelId;
+
+    /** 被调科目 */
+    @Excel(name = "被调科目")
+    private String beSubject;
+
+    /** 调课科目是第几节课 */
+    @Excel(name = "调课科目是第几节课")
+    private String beIsNum;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "被调课科目的上课时间(yyyy-MM-dd)", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date beSubjectTime;
+
+
+    /** 周几 */
+    @Excel(name = "周几")
+    private String week;
+
+    /** 结果(1:待审核,2:同意,3:不同意) */
+    @Excel(name = "结果", readConverterExp = "1=:待审核,2:同意,3:不同意")
+    private String isPass;
+
+    /** 内容描述 */
+    @Excel(name = "内容描述")
+    private String content;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long auditId;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String auditUser;
+
+    /** 审核意见 */
+    @Excel(name = "审核意见")
+    private String opinion;
+
+    private List<Long> subjectClassIds;
+
+    public List<Long> getSubjectClassIds() {
+        return subjectClassIds;
+    }
+
+    public void setSubjectClassIds(List<Long> subjectClassIds) {
+        this.subjectClassIds = subjectClassIds;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setApplyId(Long applyId)
+    {
+        this.applyId = applyId;
+    }
+
+    public Long getApplyId()
+    {
+        return applyId;
+    }
+    public void setApplyName(String applyName)
+    {
+        this.applyName = applyName;
+    }
+
+    public String getApplyName()
+    {
+        return applyName;
+    }
+    public void setApplyTime(Date applyTime)
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime()
+    {
+        return applyTime;
+    }
+    public void setSubjectClassId(Long subjectClassId)
+    {
+        this.subjectClassId = subjectClassId;
+    }
+
+    public Long getSubjectClassId()
+    {
+        return subjectClassId;
+    }
+    public void setSubjectClass(String subjectClass)
+    {
+        this.subjectClass = subjectClass;
+    }
+
+    public String getSubjectClass()
+    {
+        return subjectClass;
+    }
+    public void setSubject(String subject)
+    {
+        this.subject = subject;
+    }
+
+    public String getSubject()
+    {
+        return subject;
+    }
+    public void setBeSubject(String beSubject)
+    {
+        this.beSubject = beSubject;
+    }
+
+    public String getBeSubject()
+    {
+        return beSubject;
+    }
+    public void setWeek(String week)
+    {
+        this.week = week;
+    }
+
+    public String getWeek()
+    {
+        return week;
+    }
+    public void setIsPass(String isPass)
+    {
+        this.isPass = isPass;
+    }
+
+    public String getIsPass()
+    {
+        return isPass;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    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 setOpinion(String opinion)
+    {
+        this.opinion = opinion;
+    }
+
+    public String getOpinion()
+    {
+        return opinion;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+
+    public String getIsNum() {
+        return isNum;
+    }
+
+    public Date getSubjectTime() {
+        return subjectTime;
+    }
+
+    public String getSubjectWeek() {
+        return subjectWeek;
+    }
+
+    public String getBePersonnel() {
+        return bePersonnel;
+    }
+
+    public Long getBePersonnelId() {
+        return bePersonnelId;
+    }
+
+    public String getBeIsNum() {
+        return beIsNum;
+    }
+
+    public Date getBeSubjectTime() {
+        return beSubjectTime;
+    }
+
+    public void setIsNum(String isNum) {
+        this.isNum = isNum;
+    }
+
+    public void setSubjectTime(Date subjectTime) {
+        this.subjectTime = subjectTime;
+    }
+
+    public void setSubjectWeek(String subjectWeek) {
+        this.subjectWeek = subjectWeek;
+    }
+
+    public void setBePersonnel(String bePersonnel) {
+        this.bePersonnel = bePersonnel;
+    }
+
+    public void setBePersonnelId(Long bePersonnelId) {
+        this.bePersonnelId = bePersonnelId;
+    }
+
+    public void setBeIsNum(String beIsNum) {
+        this.beIsNum = beIsNum;
+    }
+
+    public void setBeSubjectTime(Date beSubjectTime) {
+        this.beSubjectTime = beSubjectTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("applyId", getApplyId())
+            .append("applyName", getApplyName())
+            .append("applyTime", getApplyTime())
+            .append("subjectClassId", getSubjectClassId())
+            .append("subjectClass", getSubjectClass())
+            .append("subject", getSubject())
+            .append("beSubject", getBeSubject())
+            .append("week", getWeek())
+            .append("isPass", getIsPass())
+            .append("content", getContent())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("auditId", getAuditId())
+            .append("auditUser", getAuditUser())
+            .append("opinion", getOpinion())
+            .toString();
+    }
+}

+ 344 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CourseTable.java

@@ -0,0 +1,344 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Set;
+
+/**
+ * 课程对象 course_table
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public class CourseTable extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 学校id */
+    private String schoolId;
+
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 班级id */
+    private String classId;
+
+    /** 班级名称 */
+    @Excel(name = "班级名称")
+    private String className;
+
+    /** 周几:1:周一,2:周二,3:周三,4:周四,5:周五 */
+    @Excel(name = "周几:1:周一,2:周二,3:周三,4:周四,5:周五")
+    private String week;
+
+    /** 第一节课 */
+    @Excel(name = "第一节课")
+    private String oneClass;
+
+    /** 第一节课老师 */
+    @Excel(name = "第一节课老师")
+    private String oneTeacher;
+
+    /** 第二节课 */
+    @Excel(name = "第二节课")
+    private String twoClass;
+
+    /** 第二节课老师 */
+    @Excel(name = "第二节课老师")
+    private String twoTeacher;
+
+    /** 第三节课 */
+    @Excel(name = "第三节课")
+    private String threeClass;
+
+    /** 第三节课老师 */
+    @Excel(name = "第三节课老师")
+    private String threeTeacher;
+
+    /** 第四节课 */
+    @Excel(name = "第四节课")
+    private String fourClass;
+
+    /** 第四节课老师 */
+    @Excel(name = "第四节课老师")
+    private String fourTeacher;
+
+    /** 第五节课 */
+    @Excel(name = "第五节课")
+    private String fiveClass;
+
+    /** 第五节课老师 */
+    @Excel(name = "第五节课老师")
+    private String fiveTeacher;
+
+    /** 第六节课 */
+    @Excel(name = "第六节课")
+    private String sixClass;
+
+    /** 第六节课老师 */
+    @Excel(name = "第六节课老师")
+    private String sixTeacher;
+
+    /** 第七节课 */
+    @Excel(name = "第七节课")
+    private String sevenClass;
+
+    /** 第七节课老师 */
+    @Excel(name = "第七节课老师")
+    private String sevenTeacher;
+
+    /** 第八节课 */
+    @Excel(name = "第八节课")
+    private String eightClass;
+
+    /** 第八节课老师 */
+    @Excel(name = "第八节课老师")
+    private String eightTeacher;
+
+    /** 被调的课程 */
+    Set<Long> classNum;
+
+    public Set<Long> getClassNum() {
+        return classNum;
+    }
+
+    public void setClassNum(Set<Long> classNum) {
+        this.classNum = classNum;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setSchoolId(String schoolId)
+    {
+        this.schoolId = schoolId;
+    }
+
+    public String getSchoolId()
+    {
+        return schoolId;
+    }
+    public void setSchoolName(String schoolName)
+    {
+        this.schoolName = schoolName;
+    }
+
+    public String getSchoolName()
+    {
+        return schoolName;
+    }
+    public void setClassId(String classId)
+    {
+        this.classId = classId;
+    }
+
+    public String getClassId()
+    {
+        return classId;
+    }
+
+
+    public String getClassName()
+    {
+        return className;
+    }
+    public void setWeek(String week)
+    {
+        this.week = week;
+    }
+
+    public String getWeek()
+    {
+        return week;
+    }
+    public void setOneClass(String oneClass)
+    {
+        this.oneClass = oneClass;
+    }
+
+    public String getOneClass()
+    {
+        return oneClass;
+    }
+    public void setOneTeacher(String oneTeacher)
+    {
+        this.oneTeacher = oneTeacher;
+    }
+
+    public String getOneTeacher()
+    {
+        return oneTeacher;
+    }
+    public void setTwoClass(String twoClass)
+    {
+        this.twoClass = twoClass;
+    }
+
+    public String getTwoClass()
+    {
+        return twoClass;
+    }
+    public void setTwoTeacher(String twoTeacher)
+    {
+        this.twoTeacher = twoTeacher;
+    }
+
+    public String getTwoTeacher()
+    {
+        return twoTeacher;
+    }
+    public void setThreeClass(String threeClass)
+    {
+        this.threeClass = threeClass;
+    }
+
+    public String getThreeClass()
+    {
+        return threeClass;
+    }
+    public void setThreeTeacher(String threeTeacher)
+    {
+        this.threeTeacher = threeTeacher;
+    }
+
+    public String getThreeTeacher()
+    {
+        return threeTeacher;
+    }
+    public void setFourClass(String fourClass)
+    {
+        this.fourClass = fourClass;
+    }
+
+    public String getFourClass()
+    {
+        return fourClass;
+    }
+    public void setFourTeacher(String fourTeacher)
+    {
+        this.fourTeacher = fourTeacher;
+    }
+
+    public String getFourTeacher()
+    {
+        return fourTeacher;
+    }
+    public void setFiveClass(String fiveClass)
+    {
+        this.fiveClass = fiveClass;
+    }
+
+    public String getFiveClass()
+    {
+        return fiveClass;
+    }
+    public void setFiveTeacher(String fiveTeacher)
+    {
+        this.fiveTeacher = fiveTeacher;
+    }
+
+    public String getFiveTeacher()
+    {
+        return fiveTeacher;
+    }
+    public void setSixClass(String sixClass)
+    {
+        this.sixClass = sixClass;
+    }
+
+    public String getSixClass()
+    {
+        return sixClass;
+    }
+    public void setSixTeacher(String sixTeacher)
+    {
+        this.sixTeacher = sixTeacher;
+    }
+
+    public String getSixTeacher()
+    {
+        return sixTeacher;
+    }
+    public void setSevenClass(String sevenClass)
+    {
+        this.sevenClass = sevenClass;
+    }
+
+    public String getSevenClass()
+    {
+        return sevenClass;
+    }
+    public void setSevenTeacher(String sevenTeacher)
+    {
+        this.sevenTeacher = sevenTeacher;
+    }
+
+    public String getSevenTeacher()
+    {
+        return sevenTeacher;
+    }
+    public void setEightClass(String eightClass)
+    {
+        this.eightClass = eightClass;
+    }
+
+    public String getEightClass()
+    {
+        return eightClass;
+    }
+    public void setEightTeacher(String eightTeacher)
+    {
+        this.eightTeacher = eightTeacher;
+    }
+
+    public String getEightTeacher()
+    {
+        return eightTeacher;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("schoolId", getSchoolId())
+            .append("schoolName", getSchoolName())
+            .append("classId", getClassId())
+            .append("className", getClassName())
+            .append("week", getWeek())
+            .append("oneClass", getOneClass())
+            .append("oneTeacher", getOneTeacher())
+            .append("twoClass", getTwoClass())
+            .append("twoTeacher", getTwoTeacher())
+            .append("threeClass", getThreeClass())
+            .append("threeTeacher", getThreeTeacher())
+            .append("fourClass", getFourClass())
+            .append("fourTeacher", getFourTeacher())
+            .append("fiveClass", getFiveClass())
+            .append("fiveTeacher", getFiveTeacher())
+            .append("sixClass", getSixClass())
+            .append("sixTeacher", getSixTeacher())
+            .append("sevenClass", getSevenClass())
+            .append("sevenTeacher", getSevenTeacher())
+            .append("eightClass", getEightClass())
+            .append("eightTeacher", getEightTeacher())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 293 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/CourseTableTime.java

@@ -0,0 +1,293 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 课程-时间对象 course_table_time
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public class CourseTableTime extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 学校id */
+    private String schoolId;
+
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 第一节课开始时间 */
+    @Excel(name = "第一节课开始时间")
+    private String oneStartTime;
+
+    /** 第一节课结束时间 */
+    @Excel(name = "第一节课结束时间")
+    private String oneEndTime;
+
+    /** 第二节课开始时间 */
+    @Excel(name = "第二节课开始时间")
+    private String twoStartTime;
+
+    /** 第二节课结束时间 */
+    @Excel(name = "第二节课结束时间")
+    private String twoEndTime;
+
+    /** 第三节课开始时间 */
+    @Excel(name = "第三节课开始时间")
+    private String threeStartTime;
+
+    /** 第三节课结束时间 */
+    @Excel(name = "第三节课结束时间")
+    private String threeEndTime;
+
+    /** 第四节课开始时间 */
+    @Excel(name = "第四节课开始时间")
+    private String fourStartTime;
+
+    /** 第四节课结束时间 */
+    @Excel(name = "第四节课结束时间")
+    private String fourEndTime;
+
+    /** 第五节课开始时间 */
+    @Excel(name = "第五节课开始时间")
+    private String fiveStartTime;
+
+    /** 第五节课结束时间 */
+    @Excel(name = "第五节课结束时间")
+    private String fiveEndTime;
+
+    /** 第六节课开始时间 */
+    @Excel(name = "第六节课开始时间")
+    private String sixStartTime;
+
+    /** 第六节课结束时间 */
+    @Excel(name = "第六节课结束时间")
+    private String sixEndTime;
+
+    /** 第七节课开始时间 */
+    @Excel(name = "第七节课开始时间")
+    private String sevenStartTime;
+
+    /** 第七节课结束时间 */
+    @Excel(name = "第七节课结束时间")
+    private String sevenEndTime;
+
+    /** 第八节课开始时间 */
+    @Excel(name = "第八节课开始时间")
+    private String eightStartTime;
+
+    /** 第八节课结束时间 */
+    @Excel(name = "第八节课结束时间")
+    private String eightEndTime;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setSchoolId(String schoolId)
+    {
+        this.schoolId = schoolId;
+    }
+
+    public String getSchoolId()
+    {
+        return schoolId;
+    }
+    public void setSchoolName(String schoolName)
+    {
+        this.schoolName = schoolName;
+    }
+
+    public String getSchoolName()
+    {
+        return schoolName;
+    }
+    public void setOneStartTime(String oneStartTime)
+    {
+        this.oneStartTime = oneStartTime;
+    }
+
+    public String getOneStartTime()
+    {
+        return oneStartTime;
+    }
+    public void setOneEndTime(String oneEndTime)
+    {
+        this.oneEndTime = oneEndTime;
+    }
+
+    public String getOneEndTime()
+    {
+        return oneEndTime;
+    }
+    public void setTwoStartTime(String twoStartTime)
+    {
+        this.twoStartTime = twoStartTime;
+    }
+
+    public String getTwoStartTime()
+    {
+        return twoStartTime;
+    }
+    public void setTwoEndTime(String twoEndTime)
+    {
+        this.twoEndTime = twoEndTime;
+    }
+
+    public String getTwoEndTime()
+    {
+        return twoEndTime;
+    }
+    public void setThreeStartTime(String threeStartTime)
+    {
+        this.threeStartTime = threeStartTime;
+    }
+
+    public String getThreeStartTime()
+    {
+        return threeStartTime;
+    }
+    public void setThreeEndTime(String threeEndTime)
+    {
+        this.threeEndTime = threeEndTime;
+    }
+
+    public String getThreeEndTime()
+    {
+        return threeEndTime;
+    }
+    public void setFourStartTime(String fourStartTime)
+    {
+        this.fourStartTime = fourStartTime;
+    }
+
+    public String getFourStartTime()
+    {
+        return fourStartTime;
+    }
+    public void setFourEndTime(String fourEndTime)
+    {
+        this.fourEndTime = fourEndTime;
+    }
+
+    public String getFourEndTime()
+    {
+        return fourEndTime;
+    }
+    public void setFiveStartTime(String fiveStartTime)
+    {
+        this.fiveStartTime = fiveStartTime;
+    }
+
+    public String getFiveStartTime()
+    {
+        return fiveStartTime;
+    }
+    public void setFiveEndTime(String fiveEndTime)
+    {
+        this.fiveEndTime = fiveEndTime;
+    }
+
+    public String getFiveEndTime()
+    {
+        return fiveEndTime;
+    }
+    public void setSixStartTime(String sixStartTime)
+    {
+        this.sixStartTime = sixStartTime;
+    }
+
+    public String getSixStartTime()
+    {
+        return sixStartTime;
+    }
+    public void setSixEndTime(String sixEndTime)
+    {
+        this.sixEndTime = sixEndTime;
+    }
+
+    public String getSixEndTime()
+    {
+        return sixEndTime;
+    }
+    public void setSevenStartTime(String sevenStartTime)
+    {
+        this.sevenStartTime = sevenStartTime;
+    }
+
+    public String getSevenStartTime()
+    {
+        return sevenStartTime;
+    }
+    public void setSevenEndTime(String sevenEndTime)
+    {
+        this.sevenEndTime = sevenEndTime;
+    }
+
+    public String getSevenEndTime()
+    {
+        return sevenEndTime;
+    }
+    public void setEightStartTime(String eightStartTime)
+    {
+        this.eightStartTime = eightStartTime;
+    }
+
+    public String getEightStartTime()
+    {
+        return eightStartTime;
+    }
+    public void setEightEndTime(String eightEndTime)
+    {
+        this.eightEndTime = eightEndTime;
+    }
+
+    public String getEightEndTime()
+    {
+        return eightEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("schoolId", getSchoolId())
+            .append("schoolName", getSchoolName())
+            .append("oneStartTime", getOneStartTime())
+            .append("oneEndTime", getOneEndTime())
+            .append("twoStartTime", getTwoStartTime())
+            .append("twoEndTime", getTwoEndTime())
+            .append("threeStartTime", getThreeStartTime())
+            .append("threeEndTime", getThreeEndTime())
+            .append("fourStartTime", getFourStartTime())
+            .append("fourEndTime", getFourEndTime())
+            .append("fiveStartTime", getFiveStartTime())
+            .append("fiveEndTime", getFiveEndTime())
+            .append("sixStartTime", getSixStartTime())
+            .append("sixEndTime", getSixEndTime())
+            .append("sevenStartTime", getSevenStartTime())
+            .append("sevenEndTime", getSevenEndTime())
+            .append("eightStartTime", getEightStartTime())
+            .append("eightEndTime", getEightEndTime())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 56 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/FlowProcDefDto.java

@@ -0,0 +1,56 @@
+package org.dromara.system.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>流程定义<p>
+ *
+ * @author Tony
+ * @date 2021-04-03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("流程定义")
+public class FlowProcDefDto implements Serializable {
+
+    @ApiModelProperty("流程id")
+    private String id;
+
+    @ApiModelProperty("流程名称")
+    private String name;
+
+    @ApiModelProperty("流程key")
+    private String flowKey;
+
+    @ApiModelProperty("流程分类")
+    private String category;
+
+    @ApiModelProperty("配置表单名称")
+    private String formName;
+
+    @ApiModelProperty("配置表单id")
+    private Long formId;
+
+    @ApiModelProperty("版本")
+    private int version;
+
+    @ApiModelProperty("部署ID")
+    private String deploymentId;
+
+    @ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
+    private int suspensionState;
+
+    @ApiModelProperty("部署时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deploymentTime;
+
+
+}

+ 243 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/RecordLeave.java

@@ -0,0 +1,243 @@
+package org.dromara.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 请假记录信息对象 record_leave
+ *
+ * @author boman
+ * @date 2023-08-08
+ */
+public class RecordLeave extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 类型 1:临时请假 2:事假 */
+    @Excel(name = "类型 1:临时请假 2:事假")
+    private String type;
+
+    /** 请假开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "请假开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    /** 请假结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "请假结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    /** 请假理由 */
+    @Excel(name = "请假理由")
+    private String reason;
+
+    /** 班级id */
+    @Excel(name = "班级id")
+    private String classId;
+
+    /** 部门名称 */
+    @Excel(name = "班级名称")
+    private String className;
+
+    /** 请假人id */
+    @Excel(name = "请假人id")
+    private String absenteeId;
+
+    /** 请假人姓名 */
+    @Excel(name = "请假人姓名")
+    private String absenteeName;
+
+    /** 审批人员id */
+    @Excel(name = "审批人员id")
+    private Long examinersId;
+
+    /** 审批人员姓名 */
+    @Excel(name = "审批人员姓名")
+    private String examinersName;
+
+    /** 请假类别 1:病假,2:产假,3:陪产假,4:婚假,5:丧假,6:其他 */
+    @Excel(name = "请假类别 1:病假,2:产假,3:陪产假,4:婚假,5:丧假,6:其他")
+    private String category;
+
+    /** 是否通过 0:未处理,1:不通过,2:通过 */
+    @Excel(name = "是否通过 0:未处理,1:不通过,2:通过")
+    private String isPass;
+
+    /** 图片地址 */
+    @Excel(name = "图片地址")
+    private String photo;
+
+    /** 提交时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "提交时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date submitTime;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+    public void setEndTime(Date endTime)
+    {
+        this.endTime = endTime;
+    }
+
+    public Date getEndTime()
+    {
+        return endTime;
+    }
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+
+    public String getClassId() {
+        return classId;
+    }
+
+    public void setClassId(String classId) {
+        this.classId = classId;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public void setAbsenteeId(String absenteeId)
+    {
+        this.absenteeId = absenteeId;
+    }
+
+    public String getAbsenteeId()
+    {
+        return absenteeId;
+    }
+    public void setAbsenteeName(String absenteeName)
+    {
+        this.absenteeName = absenteeName;
+    }
+
+    public String getAbsenteeName()
+    {
+        return absenteeName;
+    }
+    public void setExaminersId(Long examinersId)
+    {
+        this.examinersId = examinersId;
+    }
+
+    public Long getExaminersId()
+    {
+        return examinersId;
+    }
+    public void setExaminersName(String examinersName)
+    {
+        this.examinersName = examinersName;
+    }
+
+    public String getExaminersName()
+    {
+        return examinersName;
+    }
+    public void setCategory(String category)
+    {
+        this.category = category;
+    }
+
+    public String getCategory()
+    {
+        return category;
+    }
+    public void setIsPass(String isPass)
+    {
+        this.isPass = isPass;
+    }
+
+    public String getIsPass()
+    {
+        return isPass;
+    }
+    public void setPhoto(String photo)
+    {
+        this.photo = photo;
+    }
+
+    public String getPhoto()
+    {
+        return photo;
+    }
+    public void setSubmitTime(Date submitTime)
+    {
+        this.submitTime = submitTime;
+    }
+
+    public Date getSubmitTime()
+    {
+        return submitTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("type", getType())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("reason", getReason())
+            .append("classId", getClassId())
+            .append("className", getClassName())
+            .append("absenteeId", getAbsenteeId())
+            .append("absenteeName", getAbsenteeName())
+            .append("examinersId", getExaminersId())
+            .append("examinersName", getExaminersName())
+            .append("category", getCategory())
+            .append("isPass", getIsPass())
+            .append("photo", getPhoto())
+            .append("submitTime", getSubmitTime())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,104 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+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();
+    }
+}

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

@@ -0,0 +1,230 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+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();
+    }
+}

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

@@ -0,0 +1,153 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+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<com.ruoyi.system.domain.RegisterSchoolFile> registerSchoolFileList;
+
+    public List<com.ruoyi.system.domain.RegisterSchoolFile> getRegisterSchoolFileList() {
+        return registerSchoolFileList;
+    }
+
+    public void setRegisterSchoolFileList(List<com.ruoyi.system.domain.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();
+    }
+}

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

@@ -0,0 +1,104 @@
+package org.dromara.system.domain;
+
+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 + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,165 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+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<com.ruoyi.system.domain.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<com.ruoyi.system.domain.RegisterTeacherClass> getRegisterTeacherClassList() {
+        return registerTeacherClassList;
+    }
+
+    public void setRegisterTeacherClassList(List<com.ruoyi.system.domain.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();
+    }
+}

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

@@ -0,0 +1,98 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 注册-老师-班级(学科)对象 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();
+    }
+}

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

@@ -0,0 +1,451 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 学生档案信息对象 student_info
+ *
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+public class StudentInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 学生id(家长-学生(审核通过之后数据)表id) */
+    @Excel(name = "学生id", readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1:男,2:女) */
+    @Excel(name = "性别(1:男,2:女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 学校 */
+    @Excel(name = "学校")
+    private String school;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 身高 */
+    @Excel(name = "身高")
+    private String height;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 血型 */
+    @Excel(name = "血型")
+    private String bloodType;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politicalStatus;
+
+    /** 证件照(地址) */
+    @Excel(name = "证件照(地址)")
+    private String identificationPhoto;
+
+    /** 门禁照(地址) */
+    @Excel(name = "门禁照(地址)")
+    private String entrancePermit;
+
+    /** 父亲 */
+    @Excel(name = "父亲")
+    private String fatherName;
+
+    /** 父亲联系方式 */
+    @Excel(name = "父亲联系方式")
+    private String fatherTelephone;
+
+    /** 母亲 */
+    @Excel(name = "母亲")
+    private String motherName;
+
+    /** 母亲联系方式 */
+    @Excel(name = "母亲联系方式")
+    private String motherTelephone;
+
+    /** 居住地址 */
+    @Excel(name = "s")
+    private String address;
+
+    /** 是否近视(1:是,2:否) */
+    private String isNearsightedness;
+    /** 近视度数 */
+    private String degreeMyopia;
+    /** 健康状况 */
+    private String health;
+    /** 心理状况 */
+    private String mind;
+    /** 经度 */
+    private String longitude;
+    /** 纬度 */
+    private String latitude;
+
+    /** 有无过往病史(1:有,2:无) */
+    private String isMedicalHistory;
+    /** 病史描述 */
+    private String medicalDescription;
+    /** 心理健康描述 */
+    private String psychologicalDescription;
+
+
+    /** 留守儿童(1:是,2:否) */
+    private String isLset;
+    /** 是否贫困(1:是,2:否) */
+    private String isPoverty;
+
+
+    /** 紧急联系人 */
+    private String emergencyContact;
+    /** 紧急联系人手机号 */
+    private String emergencyContactTelephone;
+
+    private String classId;
+
+    private Long parentsId;
+
+    public String getEmergencyContact() {
+        return emergencyContact;
+    }
+
+    public String getEmergencyContactTelephone() {
+        return emergencyContactTelephone;
+    }
+
+    public void setEmergencyContact(String emergencyContact) {
+        this.emergencyContact = emergencyContact;
+    }
+
+    public void setEmergencyContactTelephone(String emergencyContactTelephone) {
+        this.emergencyContactTelephone = emergencyContactTelephone;
+    }
+
+
+    public Long getParentsId() {
+        return parentsId;
+    }
+
+    public void setParentsId(Long parentsId) {
+        this.parentsId = parentsId;
+    }
+
+    public void setIsLset(String isLset) {
+        this.isLset = isLset;
+    }
+
+    public void setIsPoverty(String isPoverty) {
+        this.isPoverty = isPoverty;
+    }
+
+    public String getIsLset() {
+        return isLset;
+    }
+
+    public String getIsPoverty() {
+        return isPoverty;
+    }
+
+    public void setIsMedicalHistory(String isMedicalHistory) {
+        this.isMedicalHistory = isMedicalHistory;
+    }
+
+    public void setMedicalDescription(String medicalDescription) {
+        this.medicalDescription = medicalDescription;
+    }
+
+    public void setPsychologicalDescription(String psychologicalDescription) {
+        this.psychologicalDescription = psychologicalDescription;
+    }
+
+    public String getIsMedicalHistory() {
+        return isMedicalHistory;
+    }
+
+    public String getMedicalDescription() {
+        return medicalDescription;
+    }
+
+    public String getPsychologicalDescription() {
+        return psychologicalDescription;
+    }
+
+    public String getIsNearsightedness() {
+        return isNearsightedness;
+    }
+
+    public String getDegreeMyopia() {
+        return degreeMyopia;
+    }
+
+    public String getHealth() {
+        return health;
+    }
+
+    public String getMind() {
+        return mind;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setIsNearsightedness(String isNearsightedness) {
+        this.isNearsightedness = isNearsightedness;
+    }
+
+    public void setDegreeMyopia(String degreeMyopia) {
+        this.degreeMyopia = degreeMyopia;
+    }
+
+    public void setHealth(String health) {
+        this.health = health;
+    }
+
+    public void setMind(String mind) {
+        this.mind = mind;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getClassId() {
+        return classId;
+    }
+
+    public void setClassId(String classId) {
+        this.classId = classId;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setStudentId(Long studentId)
+    {
+        this.studentId = studentId;
+    }
+
+    public Long getStudentId()
+    {
+        return studentId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+    public void setAge(String age)
+    {
+        this.age = age;
+    }
+
+    public String getAge()
+    {
+        return age;
+    }
+    public void setSchool(String school)
+    {
+        this.school = school;
+    }
+
+    public String getSchool()
+    {
+        return school;
+    }
+    public void setStudentNumber(String studentNumber)
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber()
+    {
+        return studentNumber;
+    }
+    public void setIdCard(String idCard)
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard()
+    {
+        return idCard;
+    }
+    public void setHeight(String height)
+    {
+        this.height = height;
+    }
+
+    public String getHeight()
+    {
+        return height;
+    }
+    public void setWeight(String weight)
+    {
+        this.weight = weight;
+    }
+
+    public String getWeight()
+    {
+        return weight;
+    }
+    public void setBloodType(String bloodType)
+    {
+        this.bloodType = bloodType;
+    }
+
+    public String getBloodType()
+    {
+        return bloodType;
+    }
+    public void setPoliticalStatus(String politicalStatus)
+    {
+        this.politicalStatus = politicalStatus;
+    }
+
+    public String getPoliticalStatus()
+    {
+        return politicalStatus;
+    }
+    public void setIdentificationPhoto(String identificationPhoto)
+    {
+        this.identificationPhoto = identificationPhoto;
+    }
+
+    public String getIdentificationPhoto()
+    {
+        return identificationPhoto;
+    }
+    public void setEntrancePermit(String entrancePermit)
+    {
+        this.entrancePermit = entrancePermit;
+    }
+
+    public String getEntrancePermit()
+    {
+        return entrancePermit;
+    }
+    public void setFatherName(String fatherName)
+    {
+        this.fatherName = fatherName;
+    }
+
+    public String getFatherName()
+    {
+        return fatherName;
+    }
+    public void setFatherTelephone(String fatherTelephone)
+    {
+        this.fatherTelephone = fatherTelephone;
+    }
+
+    public String getFatherTelephone()
+    {
+        return fatherTelephone;
+    }
+    public void setMotherName(String motherName)
+    {
+        this.motherName = motherName;
+    }
+
+    public String getMotherName()
+    {
+        return motherName;
+    }
+    public void setMotherTelephone(String motherTelephone)
+    {
+        this.motherTelephone = motherTelephone;
+    }
+
+    public String getMotherTelephone()
+    {
+        return motherTelephone;
+    }
+    public void setAddress(String address)
+    {
+        this.address = address;
+    }
+
+    public String getAddress()
+    {
+        return address;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("studentId", getStudentId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("school", getSchool())
+            .append("studentNumber", getStudentNumber())
+            .append("idCard", getIdCard())
+            .append("height", getHeight())
+            .append("weight", getWeight())
+            .append("bloodType", getBloodType())
+            .append("politicalStatus", getPoliticalStatus())
+            .append("identificationPhoto", getIdentificationPhoto())
+            .append("entrancePermit", getEntrancePermit())
+            .append("fatherName", getFatherName())
+            .append("fatherTelephone", getFatherTelephone())
+            .append("motherName", getMotherName())
+            .append("motherTelephone", getMotherTelephone())
+            .append("address", getAddress())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,450 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 学生档案历史信息对象 student_info_old
+ *
+ * @author ruoyi
+ * @date 2023-07-28
+ */
+public class StudentInfoOld extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long oldId;
+
+    /** 学生id(家长-学生(审核通过之后数据)表id) */
+    @Excel(name = "学生id", readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1:男,2:女) */
+    @Excel(name = "性别(1:男,2:女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 学校 */
+    @Excel(name = "学校")
+    private String school;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 是否近视(1:是,2:否) */
+    @Excel(name = "是否近视", readConverterExp = "1=:是,2:否")
+    private String isNearsightedness;
+
+    /** 近视度数 */
+    @Excel(name = "近视度数")
+    private String degreeMyopia;
+
+    /** 身高 */
+    @Excel(name = "身高")
+    private String height;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 血型 */
+    @Excel(name = "血型")
+    private String bloodType;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politicalStatus;
+
+    /** 健康状况 */
+    @Excel(name = "健康状况")
+    private String health;
+
+    /** 证件照(地址) */
+    @Excel(name = "证件照(地址)")
+    private String identificationPhoto;
+
+    /** 心理状况 */
+    @Excel(name = "心理状况")
+    private String mind;
+
+    /** 门禁照(地址) */
+    @Excel(name = "门禁照(地址)")
+    private String entrancePermit;
+
+    /** 父亲 */
+    @Excel(name = "父亲")
+    private String fatherName;
+
+    /** 父亲联系方式 */
+    @Excel(name = "父亲联系方式")
+    private String fatherTelephone;
+
+    /** 母亲 */
+    @Excel(name = "母亲")
+    private String motherName;
+
+    /** 母亲联系方式 */
+    @Excel(name = "母亲联系方式")
+    private String motherTelephone;
+
+    /** 居住地址 */
+    @Excel(name = "居住地址")
+    private String address;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /** 有无过往病史(1:有,2:无) */
+    private String isMedicalHistory;
+    /** 病史描述 */
+    private String medicalDescription;
+    /** 心理健康描述 */
+    private String psychologicalDescription;
+
+    /** 留守儿童(1:是,2:否) */
+    private String isLset;
+    /** 是否贫困(1:是,2:否) */
+    private String isPoverty;
+
+    /** 紧急联系人 */
+    private String emergencyContact;
+    /** 紧急联系人手机号 */
+    private String emergencyContactTelephone;
+
+    public String getEmergencyContact() {
+        return emergencyContact;
+    }
+
+    public String getEmergencyContactTelephone() {
+        return emergencyContactTelephone;
+    }
+
+    public void setEmergencyContact(String emergencyContact) {
+        this.emergencyContact = emergencyContact;
+    }
+
+    public void setEmergencyContactTelephone(String emergencyContactTelephone) {
+        this.emergencyContactTelephone = emergencyContactTelephone;
+    }
+
+    public String getIsLset() {
+        return isLset;
+    }
+
+    public String getIsPoverty() {
+        return isPoverty;
+    }
+
+    public void setIsLset(String isLset) {
+        this.isLset = isLset;
+    }
+
+    public void setIsPoverty(String isPoverty) {
+        this.isPoverty = isPoverty;
+    }
+
+    public String getIsMedicalHistory() {
+        return isMedicalHistory;
+    }
+
+    public String getMedicalDescription() {
+        return medicalDescription;
+    }
+
+    public String getPsychologicalDescription() {
+        return psychologicalDescription;
+    }
+
+    public void setIsMedicalHistory(String isMedicalHistory) {
+        this.isMedicalHistory = isMedicalHistory;
+    }
+
+    public void setMedicalDescription(String medicalDescription) {
+        this.medicalDescription = medicalDescription;
+    }
+
+    public void setPsychologicalDescription(String psychologicalDescription) {
+        this.psychologicalDescription = psychologicalDescription;
+    }
+
+    public Long getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(Long oldId) {
+        this.oldId = oldId;
+    }
+
+    public void setStudentId(Long studentId)
+    {
+        this.studentId = studentId;
+    }
+
+    public Long getStudentId()
+    {
+        return studentId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+    public void setAge(String age)
+    {
+        this.age = age;
+    }
+
+    public String getAge()
+    {
+        return age;
+    }
+    public void setSchool(String school)
+    {
+        this.school = school;
+    }
+
+    public String getSchool()
+    {
+        return school;
+    }
+    public void setStudentNumber(String studentNumber)
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber()
+    {
+        return studentNumber;
+    }
+    public void setIdCard(String idCard)
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard()
+    {
+        return idCard;
+    }
+    public void setIsNearsightedness(String isNearsightedness)
+    {
+        this.isNearsightedness = isNearsightedness;
+    }
+
+    public String getIsNearsightedness()
+    {
+        return isNearsightedness;
+    }
+    public void setDegreeMyopia(String degreeMyopia)
+    {
+        this.degreeMyopia = degreeMyopia;
+    }
+
+    public String getDegreeMyopia()
+    {
+        return degreeMyopia;
+    }
+    public void setHeight(String height)
+    {
+        this.height = height;
+    }
+
+    public String getHeight()
+    {
+        return height;
+    }
+    public void setWeight(String weight)
+    {
+        this.weight = weight;
+    }
+
+    public String getWeight()
+    {
+        return weight;
+    }
+    public void setBloodType(String bloodType)
+    {
+        this.bloodType = bloodType;
+    }
+
+    public String getBloodType()
+    {
+        return bloodType;
+    }
+    public void setPoliticalStatus(String politicalStatus)
+    {
+        this.politicalStatus = politicalStatus;
+    }
+
+    public String getPoliticalStatus()
+    {
+        return politicalStatus;
+    }
+    public void setHealth(String health)
+    {
+        this.health = health;
+    }
+
+    public String getHealth()
+    {
+        return health;
+    }
+    public void setIdentificationPhoto(String identificationPhoto)
+    {
+        this.identificationPhoto = identificationPhoto;
+    }
+
+    public String getIdentificationPhoto()
+    {
+        return identificationPhoto;
+    }
+    public void setMind(String mind)
+    {
+        this.mind = mind;
+    }
+
+    public String getMind()
+    {
+        return mind;
+    }
+    public void setEntrancePermit(String entrancePermit)
+    {
+        this.entrancePermit = entrancePermit;
+    }
+
+    public String getEntrancePermit()
+    {
+        return entrancePermit;
+    }
+    public void setFatherName(String fatherName)
+    {
+        this.fatherName = fatherName;
+    }
+
+    public String getFatherName()
+    {
+        return fatherName;
+    }
+    public void setFatherTelephone(String fatherTelephone)
+    {
+        this.fatherTelephone = fatherTelephone;
+    }
+
+    public String getFatherTelephone()
+    {
+        return fatherTelephone;
+    }
+    public void setMotherName(String motherName)
+    {
+        this.motherName = motherName;
+    }
+
+    public String getMotherName()
+    {
+        return motherName;
+    }
+    public void setMotherTelephone(String motherTelephone)
+    {
+        this.motherTelephone = motherTelephone;
+    }
+
+    public String getMotherTelephone()
+    {
+        return motherTelephone;
+    }
+    public void setAddress(String address)
+    {
+        this.address = address;
+    }
+
+    public String getAddress()
+    {
+        return address;
+    }
+    public void setLongitude(String longitude)
+    {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude()
+    {
+        return longitude;
+    }
+    public void setLatitude(String latitude)
+    {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude()
+    {
+        return latitude;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("oldId", getOldId())
+            .append("studentId", getStudentId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("school", getSchool())
+            .append("studentNumber", getStudentNumber())
+            .append("idCard", getIdCard())
+            .append("isNearsightedness", getIsNearsightedness())
+            .append("degreeMyopia", getDegreeMyopia())
+            .append("height", getHeight())
+            .append("weight", getWeight())
+            .append("bloodType", getBloodType())
+            .append("politicalStatus", getPoliticalStatus())
+            .append("health", getHealth())
+            .append("identificationPhoto", getIdentificationPhoto())
+            .append("mind", getMind())
+            .append("entrancePermit", getEntrancePermit())
+            .append("fatherName", getFatherName())
+            .append("fatherTelephone", getFatherTelephone())
+            .append("motherName", getMotherName())
+            .append("motherTelephone", getMotherTelephone())
+            .append("address", getAddress())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,179 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 学生生活历史信息对象 student_live_old
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public class StudentLiveOld extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long liveId;
+
+    /** 学生id(家长-学生(审核通过之后数据)表id) */
+    @Excel(name = "学生id", readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1:男,2:女) */
+    @Excel(name = "性别(1:男,2:女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 学校 */
+    @Excel(name = "学校")
+    private String school;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 身高 */
+    @Excel(name = "身高")
+    private String height;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 1:家长,2:老师 */
+    private String createType;
+
+    public String getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(String createType) {
+        this.createType = createType;
+    }
+
+    public void setLiveId(Long liveId)
+    {
+        this.liveId = liveId;
+    }
+
+    public Long getLiveId()
+    {
+        return liveId;
+    }
+    public void setStudentId(Long studentId)
+    {
+        this.studentId = studentId;
+    }
+
+    public Long getStudentId()
+    {
+        return studentId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+    public void setAge(String age)
+    {
+        this.age = age;
+    }
+
+    public String getAge()
+    {
+        return age;
+    }
+    public void setSchool(String school)
+    {
+        this.school = school;
+    }
+
+    public String getSchool()
+    {
+        return school;
+    }
+    public void setStudentNumber(String studentNumber)
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber()
+    {
+        return studentNumber;
+    }
+    public void setIdCard(String idCard)
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard()
+    {
+        return idCard;
+    }
+    public void setHeight(String height)
+    {
+        this.height = height;
+    }
+
+    public String getHeight()
+    {
+        return height;
+    }
+    public void setWeight(String weight)
+    {
+        this.weight = weight;
+    }
+
+    public String getWeight()
+    {
+        return weight;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("liveId", getLiveId())
+            .append("studentId", getStudentId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("school", getSchool())
+            .append("studentNumber", getStudentNumber())
+            .append("idCard", getIdCard())
+            .append("height", getHeight())
+            .append("weight", getWeight())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,180 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 学生心理健康历史信息对象 student_mind_old
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public class StudentMindOld extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long mindId;
+
+    /** 学生id(家长-学生(审核通过之后数据)表id) */
+    @Excel(name = "学生id", readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1:男,2:女) */
+    @Excel(name = "性别(1:男,2:女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 学校 */
+    @Excel(name = "学校")
+    private String school;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 心理状况 */
+    @Excel(name = "心理状况")
+    private String mind;
+
+    /** 心理健康描述 */
+    @Excel(name = "心理健康描述")
+    private String psychologicalDescription;
+
+
+    /** 1:家长,2:老师 */
+    private String createType;
+
+    public String getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(String createType) {
+        this.createType = createType;
+    }
+
+    public void setMindId(Long mindId)
+    {
+        this.mindId = mindId;
+    }
+
+    public Long getMindId()
+    {
+        return mindId;
+    }
+    public void setStudentId(Long studentId)
+    {
+        this.studentId = studentId;
+    }
+
+    public Long getStudentId()
+    {
+        return studentId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+    public void setAge(String age)
+    {
+        this.age = age;
+    }
+
+    public String getAge()
+    {
+        return age;
+    }
+    public void setSchool(String school)
+    {
+        this.school = school;
+    }
+
+    public String getSchool()
+    {
+        return school;
+    }
+    public void setStudentNumber(String studentNumber)
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber()
+    {
+        return studentNumber;
+    }
+    public void setIdCard(String idCard)
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard()
+    {
+        return idCard;
+    }
+    public void setMind(String mind)
+    {
+        this.mind = mind;
+    }
+
+    public String getMind()
+    {
+        return mind;
+    }
+    public void setPsychologicalDescription(String psychologicalDescription)
+    {
+        this.psychologicalDescription = psychologicalDescription;
+    }
+
+    public String getPsychologicalDescription()
+    {
+        return psychologicalDescription;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("mindId", getMindId())
+            .append("studentId", getStudentId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("school", getSchool())
+            .append("studentNumber", getStudentNumber())
+            .append("idCard", getIdCard())
+            .append("mind", getMind())
+            .append("psychologicalDescription", getPsychologicalDescription())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,332 @@
+package org.dromara.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 老师档案信息对象 teacher_info
+ *
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+public class TeacherInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 老师id(user表id)) */
+    @Excel(name = "老师id(user表id))")
+    private Long teacherId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1:男,2:女) */
+    @Excel(name = "性别(1:男,2:女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式")
+    private String phone;
+
+    /** 职称 */
+    @Excel(name = "职称")
+    private String professional;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 身高 */
+    @Excel(name = "身高")
+    private String height;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 血型 */
+    @Excel(name = "血型")
+    private String bloodType;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politicalStatus;
+
+    /** 毕业证明照(地址) */
+    @Excel(name = "毕业证明照(地址)")
+    private String graduationPhoto;
+
+    /** 毕业证书照(地址) */
+    @Excel(name = "学位证书照(地址)")
+    private String degreePhoto;
+
+    /** 教资证明照(地址) */
+    @Excel(name = "教资证明照(地址)")
+    private String teachingPhoto;
+
+    /** 职称证明照(地址) */
+    @Excel(name = "职称证明照(地址)")
+    private String professionalPhoto;
+
+    /** 证件照(地址) */
+    @Excel(name = "证件照(地址)")
+    private String identificationPhoto;
+
+    /** 门禁照(地址) */
+    @Excel(name = "门禁照(地址)")
+    private String entrancePermit;
+
+    /** 居住地址 */
+    @Excel(name = "居住地址")
+    private String address;
+
+    /** 入职时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date onBoardTime;
+
+    /** 参加工作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jobTime;
+
+    /** 学校id */
+    private Long schoolId;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Date getOnBoardTime() {
+        return onBoardTime;
+    }
+
+    public Date getJobTime() {
+        return jobTime;
+    }
+
+    public void setOnBoardTime(Date onBoardTime) {
+        this.onBoardTime = onBoardTime;
+    }
+
+    public void setJobTime(Date jobTime) {
+        this.jobTime = jobTime;
+    }
+
+    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 setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSex(String sex)
+    {
+        this.sex = sex;
+    }
+
+    public String getSex()
+    {
+        return sex;
+    }
+    public void setAge(String age)
+    {
+        this.age = age;
+    }
+
+    public String getAge()
+    {
+        return age;
+    }
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setProfessional(String professional)
+    {
+        this.professional = professional;
+    }
+
+    public String getProfessional()
+    {
+        return professional;
+    }
+    public void setIdCard(String idCard)
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard()
+    {
+        return idCard;
+    }
+    public void setHeight(String height)
+    {
+        this.height = height;
+    }
+
+    public String getHeight()
+    {
+        return height;
+    }
+    public void setWeight(String weight)
+    {
+        this.weight = weight;
+    }
+
+    public String getWeight()
+    {
+        return weight;
+    }
+    public void setBloodType(String bloodType)
+    {
+        this.bloodType = bloodType;
+    }
+
+    public String getBloodType()
+    {
+        return bloodType;
+    }
+    public void setPoliticalStatus(String politicalStatus)
+    {
+        this.politicalStatus = politicalStatus;
+    }
+
+    public String getPoliticalStatus()
+    {
+        return politicalStatus;
+    }
+    public void setGraduationPhoto(String graduationPhoto)
+    {
+        this.graduationPhoto = graduationPhoto;
+    }
+
+    public String getGraduationPhoto()
+    {
+        return graduationPhoto;
+    }
+    public void setDegreePhoto(String degreePhoto)
+    {
+        this.degreePhoto = degreePhoto;
+    }
+
+    public String getDegreePhoto()
+    {
+        return degreePhoto;
+    }
+    public void setTeachingPhoto(String teachingPhoto)
+    {
+        this.teachingPhoto = teachingPhoto;
+    }
+
+    public String getTeachingPhoto()
+    {
+        return teachingPhoto;
+    }
+    public void setProfessionalPhoto(String professionalPhoto)
+    {
+        this.professionalPhoto = professionalPhoto;
+    }
+
+    public String getProfessionalPhoto()
+    {
+        return professionalPhoto;
+    }
+    public void setIdentificationPhoto(String identificationPhoto)
+    {
+        this.identificationPhoto = identificationPhoto;
+    }
+
+    public String getIdentificationPhoto()
+    {
+        return identificationPhoto;
+    }
+    public void setEntrancePermit(String entrancePermit)
+    {
+        this.entrancePermit = entrancePermit;
+    }
+
+    public String getEntrancePermit()
+    {
+        return entrancePermit;
+    }
+    public void setAddress(String address)
+    {
+        this.address = address;
+    }
+
+    public String getAddress()
+    {
+        return address;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("teacherId", getTeacherId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("phone", getPhone())
+            .append("professional", getProfessional())
+            .append("idCard", getIdCard())
+            .append("height", getHeight())
+            .append("weight", getWeight())
+            .append("bloodType", getBloodType())
+            .append("politicalStatus", getPoliticalStatus())
+            .append("graduationPhoto", getGraduationPhoto())
+            .append("degreePhoto", getDegreePhoto())
+            .append("teachingPhoto", getTeachingPhoto())
+            .append("professionalPhoto", getProfessionalPhoto())
+            .append("identificationPhoto", getIdentificationPhoto())
+            .append("entrancePermit", getEntrancePermit())
+            .append("address", getAddress())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 109 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/XiakeConfig.java

@@ -0,0 +1,109 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 参数配置表 sys_config
+ *
+ * @author ruoyi
+ */
+public class XiakeConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 参数主键 */
+    @Excel(name = "参数主键", cellType = ColumnType.NUMERIC)
+    private Long configId;
+
+    /** 参数名称 */
+    @Excel(name = "参数名称")
+    private String configName;
+
+    /** 参数键名 */
+    @Excel(name = "参数键名")
+    private String configKey;
+
+    /** 参数键值 */
+    @Excel(name = "参数键值")
+    private String configValue;
+
+    /** 系统内置(Y是 N否) */
+    @Excel(name = "系统内置", readConverterExp = "Y=是,N=否")
+    private String configType;
+
+    public Long getConfigId()
+    {
+        return configId;
+    }
+
+    public void setConfigId(Long configId)
+    {
+        this.configId = configId;
+    }
+
+    //@NotBlank(message = "参数名称不能为空")
+    //@Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
+    public String getConfigName()
+    {
+        return configName;
+    }
+
+    public void setConfigName(String configName)
+    {
+        this.configName = configName;
+    }
+
+    //@NotBlank(message = "参数键名长度不能为空")
+    //@Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
+    public String getConfigKey()
+    {
+        return configKey;
+    }
+
+    public void setConfigKey(String configKey)
+    {
+        this.configKey = configKey;
+    }
+
+    //@NotBlank(message = "参数键值不能为空")
+    //@Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
+    public String getConfigValue()
+    {
+        return configValue;
+    }
+
+    public void setConfigValue(String configValue)
+    {
+        this.configValue = configValue;
+    }
+
+    public String getConfigType()
+    {
+        return configType;
+    }
+
+    public void setConfigType(String configType)
+    {
+        this.configType = configType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("configId", getConfigId())
+            .append("configName", getConfigName())
+            .append("configKey", getConfigKey())
+            .append("configValue", getConfigValue())
+            .append("configType", getConfigType())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 261 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/XiaoyuanNotice.java

@@ -0,0 +1,261 @@
+package org.dromara.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 校园新闻对象 xiaoyuan_notice
+ *
+ * @author boman
+ * @date 2023-06-05
+ */
+public class XiaoyuanNotice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 新闻ID */
+    private Integer noticeId;
+
+    /** 新闻缩略图 */
+    @Excel(name = "新闻缩略图")
+    private String image;
+
+    /** 新闻标题 */
+    @Excel(name = "新闻标题")
+    private String noticeTitle;
+
+    /** 新闻类型(1系统通知 2代办通知) */
+    @Excel(name = "新闻类型", readConverterExp = "1=系统通知,2=代办通知")
+    private String noticeType;
+
+    /** 新闻内容 */
+    @Excel(name = "新闻内容")
+    private String noticeContent;
+
+    /** 新闻状态(0未读 1已读) */
+    @Excel(name = "新闻状态", readConverterExp = "0=未读,1=已读")
+    private String status;
+
+    /** 隐私种类 0:全部 1:本班 2:仅自己 */
+    @Excel(name = "隐私种类 0:全部 1:本班 2:仅自己")
+    private String type;
+    //可见班级id
+    private String classIdKeJian;
+    //不可见班级id
+    private String classIdBuKeJian;
+
+    /** 发件人id */
+    @Excel(name = "发件人id")
+    private String senderId;
+
+    /** 发件人姓名 */
+    @Excel(name = "发件人姓名")
+    private String senderName;
+
+    /** 发件人班级id */
+    @Excel(name = "发件人班级id")
+    private String senderDept;
+    /**
+     * 学校名称
+     */
+    private String schoolName;
+    /**
+     * 头像地址
+     */
+    private String avatar;
+    //点赞
+    private String prised;
+    //评论
+    private String comment;
+    //收藏
+    private String collect;
+    //判断更新的类型 1:评论 2:点赞 3:收藏
+    private String updateType;
+    private String deleteId;
+
+    public String getClassIdKeJian() {
+        return classIdKeJian;
+    }
+
+    public void setClassIdKeJian(String classIdKeJian) {
+        this.classIdKeJian = classIdKeJian;
+    }
+
+    public String getClassIdBuKeJian() {
+        return classIdBuKeJian;
+    }
+
+    public void setClassIdBuKeJian(String classIdBuKeJian) {
+        this.classIdBuKeJian = classIdBuKeJian;
+    }
+
+    public String getDeleteId() {
+        return deleteId;
+    }
+
+    public void setDeleteId(String deleteId) {
+        this.deleteId = deleteId;
+    }
+
+    public String getUpdateType() {
+        return updateType;
+    }
+
+    public void setUpdateType(String updateType) {
+        this.updateType = updateType;
+    }
+
+    public String getPrised() {
+        return prised;
+    }
+
+    public void setPrised(String prised) {
+        this.prised = prised;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public String getCollect() {
+        return collect;
+    }
+
+    public void setCollect(String collect) {
+        this.collect = collect;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public void setNoticeId(Integer noticeId)
+    {
+        this.noticeId = noticeId;
+    }
+
+    public Integer getNoticeId()
+    {
+        return noticeId;
+    }
+    public void setImage(String image)
+    {
+        this.image = image;
+    }
+
+    public String getImage()
+    {
+        return image;
+    }
+    public void setNoticeTitle(String noticeTitle)
+    {
+        this.noticeTitle = noticeTitle;
+    }
+
+    public String getNoticeTitle()
+    {
+        return noticeTitle;
+    }
+    public void setNoticeType(String noticeType)
+    {
+        this.noticeType = noticeType;
+    }
+
+    public String getNoticeType()
+    {
+        return noticeType;
+    }
+    public void setNoticeContent(String noticeContent)
+    {
+        this.noticeContent = noticeContent;
+    }
+
+    public String getNoticeContent()
+    {
+        return noticeContent;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    public String getType()
+    {
+        return type;
+    }
+    public void setSenderId(String senderId)
+    {
+        this.senderId = senderId;
+    }
+
+    public String getSenderId()
+    {
+        return senderId;
+    }
+    public void setSenderName(String senderName)
+    {
+        this.senderName = senderName;
+    }
+
+    public String getSenderName()
+    {
+        return senderName;
+    }
+    public void setSenderDept(String senderDept)
+    {
+        this.senderDept = senderDept;
+    }
+
+    public String getSenderDept()
+    {
+        return senderDept;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("noticeId", getNoticeId())
+            .append("image", getImage())
+            .append("noticeTitle", getNoticeTitle())
+            .append("noticeType", getNoticeType())
+            .append("noticeContent", getNoticeContent())
+            .append("status", getStatus())
+            .append("type", getType())
+            .append("senderId", getSenderId())
+            .append("senderName", getSenderName())
+            .append("senderDept", getSenderDept())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,144 @@
+package org.dromara.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 智慧校园_审核意见对象 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();
+    }
+}

+ 194 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/notice/InfoPinglun.java

@@ -0,0 +1,194 @@
+package org.dromara.system.domain.notice;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 校园安全信息评论对象 info_pinglun
+ *
+ * @author boman
+ * @date 2023-08-01
+ */
+public class InfoPinglun extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 校园安全信息评论id */
+    private Long infoPingLunId;
+
+    /** 校园安全信息id */
+    @Excel(name = "校园安全信息id")
+    private Long infoId;
+
+    /** 校园安全信息父id */
+    @Excel(name = "校园安全信息父id")
+    private Long infoPingLunParent;
+
+    /** 评论内容 */
+    @Excel(name = "评论内容")
+    private String infoPingLunContent;
+
+    /** 头像地址 */
+    @Excel(name = "头像地址")
+    private String avatar;
+
+    /** 评论人id */
+    @Excel(name = "评论人id")
+    private Long infoPingLunUserId;
+
+    /** 评论人名称 */
+    @Excel(name = "评论人名称")
+    private String infoPingLunUserName;
+
+    /** 被评论人id */
+    @Excel(name = "被评论人id")
+    private Long infoPingLunQuiltUserId;
+
+    /** 被评论人名称 */
+    @Excel(name = "被评论人名称")
+    private String infoPingLunQuiltUserName;
+
+    /** 评论时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "评论时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date pingLunTime;
+
+    /** 评论类型 1:评论 2:回复 */
+    @Excel(name = "评论类型 1:评论 2:回复")
+    private String infoPingLunType;
+
+    /** 是否通过 N:未通过 Y:通过 */
+    @Excel(name = "是否通过 N:未通过 Y:通过")
+    private String infoPingLunExamine;
+
+    /**
+     * 对此评论的回复集合
+     */
+    private List<InfoPinglun> InfoPingLunList;
+
+    public List<InfoPinglun> getInfoPingLunList() {
+        return InfoPingLunList;
+    }
+
+    public void setInfoPingLunList(List<InfoPinglun> infoPingLunList) {
+        InfoPingLunList = infoPingLunList;
+    }
+
+    @Override
+    public String toString() {
+        return "InfoPinglun{" +
+                "infoPingLunId=" + infoPingLunId +
+                ", infoId=" + infoId +
+                ", infoPingLunParent=" + infoPingLunParent +
+                ", infoPingLunContent='" + infoPingLunContent + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", infoPingLunUserId=" + infoPingLunUserId +
+                ", infoPingLunUserName='" + infoPingLunUserName + '\'' +
+                ", infoPingLunQuiltUserId=" + infoPingLunQuiltUserId +
+                ", infoPingLunQuiltUserName='" + infoPingLunQuiltUserName + '\'' +
+                ", pingLunTime=" + pingLunTime +
+                ", infoPingLunType='" + infoPingLunType + '\'' +
+                ", infoPingLunExamine='" + infoPingLunExamine + '\'' +
+                '}';
+    }
+
+    public Long getInfoPingLunId() {
+        return infoPingLunId;
+    }
+
+    public void setInfoPingLunId(Long infoPingLunId) {
+        this.infoPingLunId = infoPingLunId;
+    }
+
+    public Long getInfoId() {
+        return infoId;
+    }
+
+    public void setInfoId(Long infoId) {
+        this.infoId = infoId;
+    }
+
+    public Long getInfoPingLunParent() {
+        return infoPingLunParent;
+    }
+
+    public void setInfoPingLunParent(Long infoPingLunParent) {
+        this.infoPingLunParent = infoPingLunParent;
+    }
+
+    public String getInfoPingLunContent() {
+        return infoPingLunContent;
+    }
+
+    public void setInfoPingLunContent(String infoPingLunContent) {
+        this.infoPingLunContent = infoPingLunContent;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public Long getInfoPingLunUserId() {
+        return infoPingLunUserId;
+    }
+
+    public void setInfoPingLunUserId(Long infoPingLunUserId) {
+        this.infoPingLunUserId = infoPingLunUserId;
+    }
+
+    public String getInfoPingLunUserName() {
+        return infoPingLunUserName;
+    }
+
+    public void setInfoPingLunUserName(String infoPingLunUserName) {
+        this.infoPingLunUserName = infoPingLunUserName;
+    }
+
+    public Long getInfoPingLunQuiltUserId() {
+        return infoPingLunQuiltUserId;
+    }
+
+    public void setInfoPingLunQuiltUserId(Long infoPingLunQuiltUserId) {
+        this.infoPingLunQuiltUserId = infoPingLunQuiltUserId;
+    }
+
+    public String getInfoPingLunQuiltUserName() {
+        return infoPingLunQuiltUserName;
+    }
+
+    public void setInfoPingLunQuiltUserName(String infoPingLunQuiltUserName) {
+        this.infoPingLunQuiltUserName = infoPingLunQuiltUserName;
+    }
+
+    public Date getPingLunTime() {
+        return pingLunTime;
+    }
+
+    public void setPingLunTime(Date pingLunTime) {
+        this.pingLunTime = pingLunTime;
+    }
+
+    public String getInfoPingLunType() {
+        return infoPingLunType;
+    }
+
+    public void setInfoPingLunType(String infoPingLunType) {
+        this.infoPingLunType = infoPingLunType;
+    }
+
+    public String getInfoPingLunExamine() {
+        return infoPingLunExamine;
+    }
+
+    public void setInfoPingLunExamine(String infoPingLunExamine) {
+        this.infoPingLunExamine = infoPingLunExamine;
+    }
+}

+ 255 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/notice/XiaoyuanInfo.java

@@ -0,0 +1,255 @@
+package org.dromara.system.domain.notice;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 校园安全信息对象 xiaoyuan_info
+ *
+ * @author boman
+ * @date 2023-08-01
+ */
+public class XiaoyuanInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 校园安全信息id */
+    private Long infoId;
+
+    /** 校园安全信息标题 */
+    @Excel(name = "校园安全信息标题")
+    private String infoTitle;
+
+    /** 信息封面 */
+    @Excel(name = "信息封面")
+    private String infoPhoto;
+
+    /** 学校id */
+    @Excel(name = "学校id")
+    private String schoolId;
+
+    /** 学校名称 */
+    @Excel(name = "学校名称")
+    private String schoolName;
+
+    /** 信息类型(1校园广播 2校园安全) */
+    @Excel(name = "信息类型", readConverterExp = "1=校园广播,2=校园安全")
+    private String infoType;
+
+    /** 信息子分类 */
+    @Excel(name = "信息子分类")
+    private String infoTypeZi;
+
+    /** 信息内容 */
+    @Excel(name = "信息内容")
+    private String infoContent;
+
+    /** 信息状态(0正常 1关闭) */
+    @Excel(name = "信息状态", readConverterExp = "0=正常,1=关闭")
+    private String status;
+
+    /** 发布时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date faBuTime;
+
+    /** 已读人数 */
+    @Excel(name = "已读人数")
+    private String infoYiDu;
+
+    /** 点赞表id */
+    @Excel(name = "点赞表id")
+    private Long infoDianZanId;
+    /** 点赞人数 */
+    @Excel(name = "点赞人数")
+    private String infoDianZan;
+
+    /** 转发人数 */
+    @Excel(name = "转发人数")
+    private String infoZhuanFa;
+    /**
+     * 是否点赞,只作为查询使用
+     */
+    private String isDianZan;
+
+    /** 信息评论表id */
+    @Excel(name = "信息评论表id")
+    private Long infoPingLunId;
+
+    /** 校园安全信息评论信息 */
+    private List<InfoPinglun> infoPingLunList;
+
+
+    public String getIsDianZan() {
+        return isDianZan;
+    }
+
+    public void setIsDianZan(String isDianZan) {
+        this.isDianZan = isDianZan;
+    }
+
+    public void setInfoId(Long infoId)
+    {
+        this.infoId = infoId;
+    }
+
+    public Long getInfoId()
+    {
+        return infoId;
+    }
+    public void setInfoTitle(String infoTitle)
+    {
+        this.infoTitle = infoTitle;
+    }
+
+    public String getInfoTitle()
+    {
+        return infoTitle;
+    }
+    public void setInfoPhoto(String infoPhoto)
+    {
+        this.infoPhoto = infoPhoto;
+    }
+
+    public String getInfoPhoto()
+    {
+        return infoPhoto;
+    }
+
+    public String getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(String schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public void setSchoolName(String schoolName)
+    {
+        this.schoolName = schoolName;
+    }
+
+    public String getSchoolName()
+    {
+        return schoolName;
+    }
+    public void setInfoType(String infoType)
+    {
+        this.infoType = infoType;
+    }
+
+    public String getInfoType()
+    {
+        return infoType;
+    }
+    public void setInfoTypeZi(String infoTypeZi)
+    {
+        this.infoTypeZi = infoTypeZi;
+    }
+
+    public String getInfoTypeZi()
+    {
+        return infoTypeZi;
+    }
+    public void setInfoContent(String infoContent)
+    {
+        this.infoContent = infoContent;
+    }
+
+    public String getInfoContent()
+    {
+        return infoContent;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+
+    public List<InfoPinglun> getInfoPingLunList() {
+        return infoPingLunList;
+    }
+
+    public void setInfoPingLunList(List<InfoPinglun> infoPingLunList) {
+        this.infoPingLunList = infoPingLunList;
+    }
+
+    public Date getFaBuTime() {
+        return faBuTime;
+    }
+
+    public void setFaBuTime(Date faBuTime) {
+        this.faBuTime = faBuTime;
+    }
+
+    public String getInfoYiDu() {
+        return infoYiDu;
+    }
+
+    public void setInfoYiDu(String infoYiDu) {
+        this.infoYiDu = infoYiDu;
+    }
+
+    public Long getInfoDianZanId() {
+        return infoDianZanId;
+    }
+
+    public void setInfoDianZanId(Long infoDianZanId) {
+        this.infoDianZanId = infoDianZanId;
+    }
+
+    public String getInfoDianZan() {
+        return infoDianZan;
+    }
+
+    public void setInfoDianZan(String infoDianZan) {
+        this.infoDianZan = infoDianZan;
+    }
+
+    public String getInfoZhuanFa() {
+        return infoZhuanFa;
+    }
+
+    public void setInfoZhuanFa(String infoZhuanFa) {
+        this.infoZhuanFa = infoZhuanFa;
+    }
+
+    public Long getInfoPingLunId() {
+        return infoPingLunId;
+    }
+
+    public void setInfoPingLunId(Long infoPingLunId) {
+        this.infoPingLunId = infoPingLunId;
+    }
+
+    @Override
+    public String toString() {
+        return "XiaoyuanInfo{" +
+                "infoId=" + infoId +
+                ", infoTitle='" + infoTitle + '\'' +
+                ", infoPhoto='" + infoPhoto + '\'' +
+                ", schoolId=" + schoolId +
+                ", schoolName='" + schoolName + '\'' +
+                ", infoType='" + infoType + '\'' +
+                ", infoTypeZi='" + infoTypeZi + '\'' +
+                ", infoContent='" + infoContent + '\'' +
+                ", status='" + status + '\'' +
+                ", faBuTime=" + faBuTime +
+                ", infoYiDu='" + infoYiDu + '\'' +
+                ", infoDianZanId=" + infoDianZanId +
+                ", infoDianZan='" + infoDianZan + '\'' +
+                ", infoZhuanFa='" + infoZhuanFa + '\'' +
+                ", infoPingLunId=" + infoPingLunId +
+                ", infoPinglunList=" + infoPingLunList +
+                '}';
+    }
+}

+ 168 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/ScoreData.java

@@ -0,0 +1,168 @@
+package org.dromara.system.domain.score;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 成绩对象 score_data
+ *
+ * @author boman
+ * @date 2023-07-20
+ */
+public class ScoreData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 考试id */
+    private Long scoreId;
+
+    /** 考试名称 */
+    @Excel(name = "考试名称")
+    private String scoreTitle;
+
+    /** 考试时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "考试时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date scoreTime;
+
+    /** 接收班级id */
+    @Excel(name = "接收班级id")
+    private String scoreClassId;
+
+    /** 接收班级名称 */
+    @Excel(name = "接收班级名称")
+    private String scoreClassName;
+
+    /** 隐私设置 1:仅自己 2:仅本班 3:全部 */
+    @Excel(name = "隐私设置 1:仅自己 2:仅本班 3:全部")
+    private String privacyType;
+    /**
+     * 已查看
+     */
+    private Double chaKan;
+    /**
+     * 未查看
+     */
+    private Double weiChaKan;
+
+    /**
+     * 查看率
+     */
+    private String percentage;
+
+    /** 成绩_子信息 */
+    private List<ScoreDataDetails> scoreDataDetailsList;
+
+    public Double getChaKan() {
+        return chaKan;
+    }
+
+    public void setChaKan(Double chaKan) {
+        this.chaKan = chaKan;
+    }
+
+    public Double getWeiChaKan() {
+        return weiChaKan;
+    }
+
+    public void setWeiChaKan(Double weiChaKan) {
+        this.weiChaKan = weiChaKan;
+    }
+
+    public String getPercentage() {
+        return percentage;
+    }
+
+    public void setPercentage(String percentage) {
+        this.percentage = percentage;
+    }
+
+    public void setScoreId(Long scoreId)
+    {
+        this.scoreId = scoreId;
+    }
+
+    public Long getScoreId()
+    {
+        return scoreId;
+    }
+    public void setScoreTitle(String scoreTitle)
+    {
+        this.scoreTitle = scoreTitle;
+    }
+
+    public String getScoreTitle()
+    {
+        return scoreTitle;
+    }
+    public void setScoreTime(Date scoreTime)
+    {
+        this.scoreTime = scoreTime;
+    }
+
+    public Date getScoreTime()
+    {
+        return scoreTime;
+    }
+
+    public String getScoreClassId() {
+        return scoreClassId;
+    }
+
+    public void setScoreClassId(String scoreClassId) {
+        this.scoreClassId = scoreClassId;
+    }
+
+    public void setScoreClassName(String scoreClassName)
+    {
+        this.scoreClassName = scoreClassName;
+    }
+
+    public String getScoreClassName()
+    {
+        return scoreClassName;
+    }
+    public void setPrivacyType(String privacyType)
+    {
+        this.privacyType = privacyType;
+    }
+
+    public String getPrivacyType()
+    {
+        return privacyType;
+    }
+
+    public List<ScoreDataDetails> getScoreDataDetailsList()
+    {
+        return scoreDataDetailsList;
+    }
+
+    public void setScoreDataDetailsList(List<ScoreDataDetails> scoreDataDetailsList)
+    {
+        this.scoreDataDetailsList = scoreDataDetailsList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("scoreId", getScoreId())
+            .append("scoreTitle", getScoreTitle())
+            .append("scoreTime", getScoreTime())
+            .append("scoreClassId", getScoreClassId())
+            .append("scoreClassName", getScoreClassName())
+            .append("privacyType", getPrivacyType())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("scoreDataDetailsList", getScoreDataDetailsList())
+            .toString();
+    }
+}

+ 300 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/ScoreDataDetails.java

@@ -0,0 +1,300 @@
+package org.dromara.system.domain.score;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 成绩_子对象 score_data_details
+ *
+ * @author boman
+ * @date 2023-07-20
+ */
+public class ScoreDataDetails extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 成绩表_子表id */
+    private Long scoreDetailsId;
+
+    /** 成绩表id */
+    @Excel(name = "成绩表id")
+    private Long scoreId;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private String scoreSort;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String scoreDataName;
+    @Excel(name = "姓名id")
+    private String scoreDataNameId;
+
+    /** 语文 */
+    @Excel(name = "语文")
+    private String yuwen;
+
+    /** 数学 */
+    @Excel(name = "数学")
+    private String shuxue;
+
+    /** 英语 */
+    @Excel(name = "英语")
+    private String yingyu;
+
+    /** 物理 */
+    @Excel(name = "物理")
+    private String wuli;
+
+    /** 化学 */
+    @Excel(name = "化学")
+    private String huaxue;
+
+    /** 生物 */
+    @Excel(name = "生物")
+    private String shengwu;
+
+    /** 政治 */
+    @Excel(name = "政治")
+    private String zhengzhi;
+
+    /** 历史 */
+    @Excel(name = "历史")
+    private String lishi;
+
+    /** 地理 */
+    @Excel(name = "地理")
+    private String dili;
+
+    /** 体育 */
+    @Excel(name = "体育")
+    private String tiyu;
+
+    /** 文综 */
+    @Excel(name = "文综")
+    private String wenzong;
+
+    /** 理综 */
+    @Excel(name = "理综")
+    private String lizong;
+
+    /** 政策分 */
+    @Excel(name = "政策分")
+    private String zhengcefen;
+    /**
+     * 总分
+     */
+    private Integer zongfen;
+    /**
+     * 是否查看
+     */
+    private String detailsType;
+
+    public Integer getZongfen() {
+        return zongfen;
+    }
+
+    public void setZongfen(Integer zongfen) {
+        this.zongfen = zongfen;
+    }
+
+    public String getDetailsType() {
+        return detailsType;
+    }
+
+    public void setDetailsType(String detailsType) {
+        this.detailsType = detailsType;
+    }
+
+    public String getScoreDataNameId() {
+        return scoreDataNameId;
+    }
+
+    public void setScoreDataNameId(String scoreDataNameId) {
+        this.scoreDataNameId = scoreDataNameId;
+    }
+
+    public void setScoreDetailsId(Long scoreDetailsId)
+    {
+        this.scoreDetailsId = scoreDetailsId;
+    }
+
+    public Long getScoreDetailsId()
+    {
+        return scoreDetailsId;
+    }
+    public void setScoreId(Long scoreId)
+    {
+        this.scoreId = scoreId;
+    }
+
+    public Long getScoreId()
+    {
+        return scoreId;
+    }
+    public void setScoreSort(String scoreSort)
+    {
+        this.scoreSort = scoreSort;
+    }
+
+    public String getScoreSort()
+    {
+        return scoreSort;
+    }
+    public void setScoreDataName(String scoreDataName)
+    {
+        this.scoreDataName = scoreDataName;
+    }
+
+    public String getScoreDataName()
+    {
+        return scoreDataName;
+    }
+    public void setYuwen(String yuwen)
+    {
+        this.yuwen = yuwen;
+    }
+
+    public String getYuwen()
+    {
+        return yuwen;
+    }
+    public void setShuxue(String shuxue)
+    {
+        this.shuxue = shuxue;
+    }
+
+    public String getShuxue()
+    {
+        return shuxue;
+    }
+    public void setYingyu(String yingyu)
+    {
+        this.yingyu = yingyu;
+    }
+
+    public String getYingyu()
+    {
+        return yingyu;
+    }
+    public void setWuli(String wuli)
+    {
+        this.wuli = wuli;
+    }
+
+    public String getWuli()
+    {
+        return wuli;
+    }
+    public void setHuaxue(String huaxue)
+    {
+        this.huaxue = huaxue;
+    }
+
+    public String getHuaxue()
+    {
+        return huaxue;
+    }
+    public void setShengwu(String shengwu)
+    {
+        this.shengwu = shengwu;
+    }
+
+    public String getShengwu()
+    {
+        return shengwu;
+    }
+    public void setZhengzhi(String zhengzhi)
+    {
+        this.zhengzhi = zhengzhi;
+    }
+
+    public String getZhengzhi()
+    {
+        return zhengzhi;
+    }
+    public void setLishi(String lishi)
+    {
+        this.lishi = lishi;
+    }
+
+    public String getLishi()
+    {
+        return lishi;
+    }
+    public void setDili(String dili)
+    {
+        this.dili = dili;
+    }
+
+    public String getDili()
+    {
+        return dili;
+    }
+    public void setTiyu(String tiyu)
+    {
+        this.tiyu = tiyu;
+    }
+
+    public String getTiyu()
+    {
+        return tiyu;
+    }
+    public void setWenzong(String wenzong)
+    {
+        this.wenzong = wenzong;
+    }
+
+    public String getWenzong()
+    {
+        return wenzong;
+    }
+    public void setLizong(String lizong)
+    {
+        this.lizong = lizong;
+    }
+
+    public String getLizong()
+    {
+        return lizong;
+    }
+    public void setZhengcefen(String zhengcefen)
+    {
+        this.zhengcefen = zhengcefen;
+    }
+
+    public String getZhengcefen()
+    {
+        return zhengcefen;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("scoreDetailsId", getScoreDetailsId())
+            .append("scoreId", getScoreId())
+            .append("scoreSort", getScoreSort())
+            .append("scoreDataName", getScoreDataName())
+            .append("yuwen", getYuwen())
+            .append("shuxue", getShuxue())
+            .append("yingyu", getYingyu())
+            .append("wuli", getWuli())
+            .append("huaxue", getHuaxue())
+            .append("shengwu", getShengwu())
+            .append("zhengzhi", getZhengzhi())
+            .append("lishi", getLishi())
+            .append("dili", getDili())
+            .append("tiyu", getTiyu())
+            .append("wenzong", getWenzong())
+            .append("lizong", getLizong())
+            .append("zhengcefen", getZhengcefen())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 67 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CourseChangeMapper.java

@@ -0,0 +1,67 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.CourseChange;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 调课Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-06-02
+ */
+public interface CourseChangeMapper
+{
+    /**
+     * 查询调课
+     *
+     * @param id 调课主键
+     * @return 调课
+     */
+    public CourseChange selectCourseChangeById(Long id);
+
+    /**
+     * 查询调课列表
+     *
+     * @param courseChange 调课
+     * @return 调课集合
+     */
+    public List<CourseChange> selectCourseChangeList(CourseChange courseChange);
+
+    /**
+     * 新增调课
+     *
+     * @param courseChange 调课
+     * @return 结果
+     */
+    public int insertCourseChange(CourseChange courseChange);
+
+    /**
+     * 修改调课
+     *
+     * @param courseChange 调课
+     * @return 结果
+     */
+    public int updateCourseChange(CourseChange courseChange);
+
+    /**
+     * 删除调课
+     *
+     * @param id 调课主键
+     * @return 结果
+     */
+    public int deleteCourseChangeById(Long id);
+
+    /**
+     * 批量删除调课
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCourseChangeByIds(Long[] ids);
+
+    List<CourseChange> selectCourseChangeListByTime(@Param("monthFirst") String monthFirst, @Param("userId")Long userId, @Param("deptId")Long deptId);
+
+    List<CourseChange> selectCourseChangeListByEdit(@Param("classId")String classId, @Param("fist")String fist, @Param("five")String five);
+}

+ 65 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CourseTableMapper.java

@@ -0,0 +1,65 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.CourseTable;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 课程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface CourseTableMapper
+{
+    /**
+     * 查询课程
+     *
+     * @param id 课程主键
+     * @return 课程
+     */
+    public CourseTable selectCourseTableById(Long id);
+
+    /**
+     * 查询课程列表
+     *
+     * @param courseTable 课程
+     * @return 课程集合
+     */
+    public List<CourseTable> selectCourseTableList(CourseTable courseTable);
+
+    /**
+     * 新增课程
+     *
+     * @param courseTable 课程
+     * @return 结果
+     */
+    public int insertCourseTable(CourseTable courseTable);
+
+    /**
+     * 修改课程
+     *
+     * @param courseTable 课程
+     * @return 结果
+     */
+    public int updateCourseTable(CourseTable courseTable);
+
+    /**
+     * 删除课程
+     *
+     * @param id 课程主键
+     * @return 结果
+     */
+    public int deleteCourseTableById(Long id);
+
+    /**
+     * 批量删除课程
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCourseTableByIds(Long[] ids);
+
+    CourseTable selectCourseTableByClassIdAndWeek(@Param("classId") Long classId, @Param("week")int week);
+}

+ 64 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/CourseTableTimeMapper.java

@@ -0,0 +1,64 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.CourseTableTime;
+
+import java.util.List;
+
+/**
+ * 课程-时间Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface CourseTableTimeMapper
+{
+    /**
+     * 查询课程-时间
+     *
+     * @param id 课程-时间主键
+     * @return 课程-时间
+     */
+    public CourseTableTime selectCourseTableTimeById(Long id);
+
+    /**
+     * 查询课程-时间列表
+     *
+     * @param courseTableTime 课程-时间
+     * @return 课程-时间集合
+     */
+    public List<CourseTableTime> selectCourseTableTimeList(CourseTableTime courseTableTime);
+
+    /**
+     * 新增课程-时间
+     *
+     * @param courseTableTime 课程-时间
+     * @return 结果
+     */
+    public int insertCourseTableTime(CourseTableTime courseTableTime);
+
+    /**
+     * 修改课程-时间
+     *
+     * @param courseTableTime 课程-时间
+     * @return 结果
+     */
+    public int updateCourseTableTime(CourseTableTime courseTableTime);
+
+    /**
+     * 删除课程-时间
+     *
+     * @param id 课程-时间主键
+     * @return 结果
+     */
+    public int deleteCourseTableTimeById(Long id);
+
+    /**
+     * 批量删除课程-时间
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCourseTableTimeByIds(Long[] ids);
+
+    CourseTableTime selectCourseTableTimeBySchoolId(Long schoolId);
+}

+ 22 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/FlowDeployMapper.java

@@ -0,0 +1,22 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.FlowProcDefDto;
+
+import java.util.List;
+
+/**
+ * 流程定义查询
+ *
+ * @author Tony
+ * @email
+ * @date 2022/1/29 5:44 下午
+ **/
+public interface FlowDeployMapper {
+
+    /**
+     * 流程定义列表
+     * @param name
+     * @return
+     */
+    List<FlowProcDefDto> selectDeployList(String name);
+}

+ 64 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/FormalParentsStudentMapper.java

@@ -0,0 +1,64 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+
+import java.util.List;
+
+/**
+ * 家长-学生(审核通过之后数据)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);
+
+    void deleteFormalParentsStudentByParentsId(Long userId);
+}

+ 66 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/FormalTeacherClassMapper.java

@@ -0,0 +1,66 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+
+import java.util.List;
+
+/**
+ * 老师-班级(学科)(审核通过之后数据)Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface FormalTeacherClassMapper
+{
+    /**
+     * 查询老师-班级(学科)(审核通过之后数据)
+     *
+     * @param id 老师-班级(学科)(审核通过之后数据)主键
+     * @return 老师-班级(学科)(审核通过之后数据)
+     */
+    public FormalTeacherClass selectFormalTeacherClassById(Long id);
+
+    /**
+     * 查询老师-班级(学科)(审核通过之后数据)列表
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 老师-班级(学科)(审核通过之后数据)集合
+     */
+    public List<FormalTeacherClass> selectFormalTeacherClassList(FormalTeacherClass formalTeacherClass);
+
+    /**
+     * 新增老师-班级(学科)(审核通过之后数据)
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 结果
+     */
+    public int insertFormalTeacherClass(FormalTeacherClass formalTeacherClass);
+
+    /**
+     * 修改老师-班级(学科)(审核通过之后数据)
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 结果
+     */
+    public int updateFormalTeacherClass(FormalTeacherClass formalTeacherClass);
+
+    /**
+     * 删除老师-班级(学科)(审核通过之后数据)
+     *
+     * @param id 老师-班级(学科)(审核通过之后数据)主键
+     * @return 结果
+     */
+    public int deleteFormalTeacherClassById(Long id);
+
+    /**
+     * 批量删除老师-班级(学科)(审核通过之后数据)
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFormalTeacherClassByIds(Long[] ids);
+
+    public List<FormalTeacherClass> getTeacherClass(String teacherId);
+
+    void deleteFormalTeacherClassByTeacherId(Long userId);
+}

+ 63 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RecordLeaveMapper.java

@@ -0,0 +1,63 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.RecordLeave;
+
+import java.util.List;
+
+/**
+ * 请假记录信息Mapper接口
+ *
+ * @author boman
+ * @date 2023-08-08
+ */
+public interface RecordLeaveMapper
+{
+    /**
+     * 查询请假记录信息
+     *
+     * @param id 请假记录信息主键
+     * @return 请假记录信息
+     */
+    public RecordLeave selectRecordLeaveById(Long id);
+
+    /**
+     * 查询请假记录信息列表
+     *
+     * @param recordLeave 请假记录信息
+     * @return 请假记录信息集合
+     */
+    public List<RecordLeave> selectRecordLeaveList(RecordLeave recordLeave);
+    public int selectRecordLeaveNum(RecordLeave recordLeave);
+
+    /**
+     * 新增请假记录信息
+     *
+     * @param recordLeave 请假记录信息
+     * @return 结果
+     */
+    public int insertRecordLeave(RecordLeave recordLeave);
+
+    /**
+     * 修改请假记录信息
+     *
+     * @param recordLeave 请假记录信息
+     * @return 结果
+     */
+    public int updateRecordLeave(RecordLeave recordLeave);
+
+    /**
+     * 删除请假记录信息
+     *
+     * @param id 请假记录信息主键
+     * @return 结果
+     */
+    public int deleteRecordLeaveById(Long id);
+
+    /**
+     * 批量删除请假记录信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteRecordLeaveByIds(Long[] ids);
+}

+ 66 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterParentsMapper.java

@@ -0,0 +1,66 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.RegisterParents;
+
+import java.util.List;
+
+/**
+ * 注册-家长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);
+
+    RegisterParents selectRegisterParentsByPhonenumber(String phonenumber);
+}

+ 72 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterParentsStudentMapper.java

@@ -0,0 +1,72 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.RegisterParentsStudent;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 注册-家长-学生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);
+
+    List<RegisterParentsStudent> selectRegisterParentsStudentListByTime(@Param("monthFirst") String monthFirst, @Param("classIds")List<Long> classIds);
+}

+ 64 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterSchoolFileMapper.java

@@ -0,0 +1,64 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.RegisterSchoolFile;
+
+import java.util.List;
+
+/**
+ * 注册-学校-附件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);
+}

+ 70 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterSchoolMapper.java

@@ -0,0 +1,70 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.RegisterSchool;
+
+import java.util.List;
+
+/**
+ * 注册-学校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);
+
+    void deleteRegisterSchoolByOpenId(String openId);
+
+    RegisterSchool selectRegisterSchooByPhonenumber(String phonenumber);
+
+    void deleteRegisterSchoolByPhonenumber(String phonenumber);
+}

+ 66 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/RegisterTeacherClassMapper.java

@@ -0,0 +1,66 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.RegisterTeacherClass;
+
+import java.util.List;
+
+/**
+ * 注册-老师-班级(学科)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);
+}

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

@@ -0,0 +1,69 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.RegisterTeacher;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 注册-老师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);
+
+    List<RegisterTeacher> selectRegisterTeacherListByTime(@Param("monthFirst") String monthFirst, @Param("deptId")Long deptId);
+
+    RegisterTeacher selectRegisterTeacherByPhonenumber(String phonenumber);
+}

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

@@ -0,0 +1,64 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.StudentInfo;
+
+import java.util.List;
+
+/**
+ * 学生档案信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+public interface StudentInfoMapper
+{
+    /**
+     * 查询学生档案信息
+     *
+     * @param id 学生档案信息主键
+     * @return 学生档案信息
+     */
+    public StudentInfo selectStudentInfoById(Long id);
+
+    /**
+     * 查询学生档案信息列表
+     *
+     * @param studentInfo 学生档案信息
+     * @return 学生档案信息集合
+     */
+    public List<StudentInfo> selectStudentInfoList(StudentInfo studentInfo);
+
+    /**
+     * 新增学生档案信息
+     *
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public int insertStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 修改学生档案信息
+     *
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public int updateStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 删除学生档案信息
+     *
+     * @param id 学生档案信息主键
+     * @return 结果
+     */
+    public int deleteStudentInfoById(Long id);
+
+    /**
+     * 批量删除学生档案信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteStudentInfoByIds(Long[] ids);
+
+    StudentInfo selectStudentInfoByStudentId(Long studentId);
+}

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

@@ -0,0 +1,64 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.StudentInfoOld;
+
+import java.util.List;
+
+/**
+ * 学生档案历史信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-28
+ */
+public interface StudentInfoOldMapper
+{
+    /**
+     * 查询学生档案历史信息
+     *
+     * @param id 学生档案历史信息主键
+     * @return 学生档案历史信息
+     */
+    public StudentInfoOld selectStudentInfoOldById(Long id);
+
+    /**
+     * 查询学生档案历史信息列表
+     *
+     * @param studentInfoOld 学生档案历史信息
+     * @return 学生档案历史信息集合
+     */
+    public List<StudentInfoOld> selectStudentInfoOldList(StudentInfoOld studentInfoOld);
+
+    /**
+     * 新增学生档案历史信息
+     *
+     * @param studentInfoOld 学生档案历史信息
+     * @return 结果
+     */
+    public int insertStudentInfoOld(StudentInfoOld studentInfoOld);
+
+    /**
+     * 修改学生档案历史信息
+     *
+     * @param studentInfoOld 学生档案历史信息
+     * @return 结果
+     */
+    public int updateStudentInfoOld(StudentInfoOld studentInfoOld);
+
+    /**
+     * 删除学生档案历史信息
+     *
+     * @param id 学生档案历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentInfoOldById(Long id);
+
+    /**
+     * 批量删除学生档案历史信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteStudentInfoOldByIds(Long[] ids);
+
+    List<StudentInfoOld> selectStudentInfoOldListEcharts(StudentInfoOld studentInfoOld);
+}

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

@@ -0,0 +1,64 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.StudentLiveOld;
+
+import java.util.List;
+
+/**
+ * 学生生活历史信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface StudentLiveOldMapper
+{
+    /**
+     * 查询学生生活历史信息
+     *
+     * @param liveId 学生生活历史信息主键
+     * @return 学生生活历史信息
+     */
+    public StudentLiveOld selectStudentLiveOldByLiveId(Long liveId);
+
+    /**
+     * 查询学生生活历史信息列表
+     *
+     * @param studentLiveOld 学生生活历史信息
+     * @return 学生生活历史信息集合
+     */
+    public List<StudentLiveOld> selectStudentLiveOldList(StudentLiveOld studentLiveOld);
+
+    /**
+     * 新增学生生活历史信息
+     *
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int insertStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 修改学生生活历史信息
+     *
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int updateStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 删除学生生活历史信息
+     *
+     * @param liveId 学生生活历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveId(Long liveId);
+
+    /**
+     * 批量删除学生生活历史信息
+     *
+     * @param liveIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveIds(Long[] liveIds);
+
+    List<StudentLiveOld> selectStudentLiveOldListEcharts(StudentLiveOld studentLiveOld);
+}

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

@@ -0,0 +1,62 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.StudentMindOld;
+
+import java.util.List;
+
+/**
+ * 学生心理健康历史信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface StudentMindOldMapper
+{
+    /**
+     * 查询学生心理健康历史信息
+     *
+     * @param mindId 学生心理健康历史信息主键
+     * @return 学生心理健康历史信息
+     */
+    public StudentMindOld selectStudentMindOldByMindId(Long mindId);
+
+    /**
+     * 查询学生心理健康历史信息列表
+     *
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 学生心理健康历史信息集合
+     */
+    public List<StudentMindOld> selectStudentMindOldList(StudentMindOld studentMindOld);
+
+    /**
+     * 新增学生心理健康历史信息
+     *
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int insertStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 修改学生心理健康历史信息
+     *
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int updateStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 删除学生心理健康历史信息
+     *
+     * @param mindId 学生心理健康历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindId(Long mindId);
+
+    /**
+     * 批量删除学生心理健康历史信息
+     *
+     * @param mindIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindIds(Long[] mindIds);
+}

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

@@ -0,0 +1,62 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.TeacherInfo;
+
+import java.util.List;
+
+/**
+ * 老师档案信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+public interface TeacherInfoMapper
+{
+    /**
+     * 查询老师档案信息
+     *
+     * @param id 老师档案信息主键
+     * @return 老师档案信息
+     */
+    public TeacherInfo selectTeacherInfoById(Long id);
+
+    /**
+     * 查询老师档案信息列表
+     *
+     * @param teacherInfo 老师档案信息
+     * @return 老师档案信息集合
+     */
+    public List<TeacherInfo> selectTeacherInfoList(TeacherInfo teacherInfo);
+
+    /**
+     * 新增老师档案信息
+     *
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public int insertTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 修改老师档案信息
+     *
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public int updateTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 删除老师档案信息
+     *
+     * @param id 老师档案信息主键
+     * @return 结果
+     */
+    public int deleteTeacherInfoById(Long id);
+
+    /**
+     * 批量删除老师档案信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTeacherInfoByIds(Long[] ids);
+}

+ 78 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/XiakeConfigMapper.java

@@ -0,0 +1,78 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.XiakeConfig;
+
+import java.util.List;
+
+/**
+ * 参数配置 数据层
+ *
+ * @author ruoyi
+ */
+public interface XiakeConfigMapper
+{
+    /**
+     * 查询参数配置信息
+     *
+     * @param config 参数配置信息
+     * @return 参数配置信息
+     */
+    public XiakeConfig selectConfig(XiakeConfig config);
+
+    /**
+     * 通过ID查询配置
+     *
+     * @param configId 参数ID
+     * @return 参数配置信息
+     */
+    public XiakeConfig selectConfigById(Long configId);
+
+    /**
+     * 查询参数配置列表
+     *
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    public List<XiakeConfig> selectConfigList(XiakeConfig config);
+
+    /**
+     * 根据键名查询参数配置信息
+     *
+     * @param configKey 参数键名
+     * @return 参数配置信息
+     */
+    public XiakeConfig checkConfigKeyUnique(String configKey);
+
+    /**
+     * 新增参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int insertConfig(XiakeConfig config);
+
+    /**
+     * 修改参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int updateConfig(XiakeConfig config);
+    public int updateConfigByKey(XiakeConfig config);
+
+    /**
+     * 删除参数配置
+     *
+     * @param configId 参数ID
+     * @return 结果
+     */
+    public int deleteConfigById(Long configId);
+
+    /**
+     * 批量删除参数信息
+     *
+     * @param configIds 需要删除的参数ID
+     * @return 结果
+     */
+    public int deleteConfigByIds(Long[] configIds);
+}

+ 64 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/XiaoyuanNoticeMapper.java

@@ -0,0 +1,64 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.XiaoyuanNotice;
+
+import java.util.List;
+
+/**
+ * 校园新闻Mapper接口
+ *
+ * @author boman
+ * @date 2023-06-05
+ */
+public interface XiaoyuanNoticeMapper
+{
+    /**
+     * 查询校园新闻
+     *
+     * @param noticeId 校园新闻主键
+     * @return 校园新闻
+     */
+    public XiaoyuanNotice selectXiaoyuanNoticeByNoticeId(Integer noticeId);
+
+    /**
+     * 查询校园新闻列表
+     *
+     * @param xiaoyuanNotice 校园新闻
+     * @return 校园新闻集合
+     */
+    public List<XiaoyuanNotice> selectXiaoyuanNoticeList(XiaoyuanNotice xiaoyuanNotice);
+    public List<XiaoyuanNotice> selectXiaoyuanNoticeMyList(XiaoyuanNotice xiaoyuanNotice);
+    public List<XiaoyuanNotice> selectXiaoyuanNoticeByMyCollect(XiaoyuanNotice xiaoyuanNotice);
+
+    /**
+     * 新增校园新闻
+     *
+     * @param xiaoyuanNotice 校园新闻
+     * @return 结果
+     */
+    public int insertXiaoyuanNotice(XiaoyuanNotice xiaoyuanNotice);
+
+    /**
+     * 修改校园新闻
+     *
+     * @param xiaoyuanNotice 校园新闻
+     * @return 结果
+     */
+    public int updateXiaoyuanNotice(XiaoyuanNotice xiaoyuanNotice);
+
+    /**
+     * 删除校园新闻
+     *
+     * @param noticeId 校园新闻主键
+     * @return 结果
+     */
+    public int deleteXiaoyuanNoticeByNoticeId(Integer noticeId);
+
+    /**
+     * 批量删除校园新闻
+     *
+     * @param noticeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteXiaoyuanNoticeByNoticeIds(Integer[] noticeIds);
+}

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

@@ -0,0 +1,62 @@
+package org.dromara.system.mapper;
+
+import com.ruoyi.system.domain.ZhxyShyj;
+
+import java.util.List;
+
+/**
+ * 智慧校园_审核意见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);
+}

+ 102 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/notice/XiaoyuanInfoMapper.java

@@ -0,0 +1,102 @@
+package org.dromara.system.mapper.notice;
+
+import com.ruoyi.system.domain.notice.InfoPinglun;
+import com.ruoyi.system.domain.notice.XiaoyuanInfo;
+
+import java.util.List;
+
+/**
+ * 校园安全信息Mapper接口
+ *
+ * @author boman
+ * @date 2023-08-01
+ */
+public interface XiaoyuanInfoMapper
+{
+    /**
+     * 查询校园安全信息
+     *
+     * @param infoId 校园安全信息主键
+     * @return 校园安全信息
+     */
+    public XiaoyuanInfo selectXiaoyuanInfoByInfoId(Long infoId);
+
+    /**
+     * 查询校园安全信息列表
+     *
+     * @param xiaoyuanInfo 校园安全信息
+     * @return 校园安全信息集合
+     */
+    public List<XiaoyuanInfo> selectXiaoyuanInfoList(XiaoyuanInfo xiaoyuanInfo);
+
+    /**
+     * 新增校园安全信息
+     *
+     * @param xiaoyuanInfo 校园安全信息
+     * @return 结果
+     */
+    public int insertXiaoyuanInfo(XiaoyuanInfo xiaoyuanInfo);
+
+    /**
+     * 修改校园安全信息
+     *
+     * @param xiaoyuanInfo 校园安全信息
+     * @return 结果
+     */
+    public int updateXiaoyuanInfo(XiaoyuanInfo xiaoyuanInfo);
+
+    /**
+     * 删除评论
+     * @param infoPinglun
+     * @return
+     */
+    public int deletePingLun(InfoPinglun infoPinglun);
+
+    /**
+     * 增加已读数量
+     * @param xiaoyuanInfo
+     * @return
+     */
+    public int updateXiaoyuanInfoYiDu(XiaoyuanInfo xiaoyuanInfo);
+
+    /**
+     * 删除校园安全信息
+     *
+     * @param infoId 校园安全信息主键
+     * @return 结果
+     */
+    public int deleteXiaoyuanInfoByInfoId(Long infoId);
+
+    /**
+     * 批量删除校园安全信息
+     *
+     * @param infoIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteXiaoyuanInfoByInfoIds(Long[] infoIds);
+
+    /**
+     * 批量删除校园安全信息评论
+     *
+     * @param infoIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInfoPingLunByInfoIds(Long[] infoIds);
+
+    /**
+     * 批量新增校园安全信息评论
+     *
+     * @param infoPinglunList 校园安全信息评论列表
+     * @return 结果
+     */
+    public int batchInfoPingLun(List<InfoPinglun> infoPinglunList);
+
+
+    /**
+     * 通过校园安全信息主键删除校园安全信息评论信息
+     *
+     * @param infoId 校园安全信息ID
+     * @return 结果
+     */
+    public int deleteInfoPingLunByInfoId(Long infoId);
+}

+ 111 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/score/ScoreDataMapper.java

@@ -0,0 +1,111 @@
+package org.dromara.system.mapper.score;
+
+import com.ruoyi.system.domain.score.ScoreData;
+import com.ruoyi.system.domain.score.ScoreDataDetails;
+
+import java.util.List;
+
+/**
+ * 成绩Mapper接口
+ *
+ * @author boman
+ * @date 2023-07-20
+ */
+public interface ScoreDataMapper
+{
+    /**
+     * 查询成绩
+     *
+     * @param scoreId 成绩主键
+     * @return 成绩
+     */
+    public ScoreData selectScoreDataByScoreId(Long scoreId);
+
+    /**
+     * 家长查看详情只返回自己孩子成绩
+     * @param scoreData
+     * @return
+     */
+    public ScoreData selectScoreDataForParents(ScoreData scoreData);
+
+    /**
+     * 查询成绩排名
+     * @param scoreClassId
+     * @return
+     */
+    public List<ScoreDataDetails> selectScoreDataByScoreClassId(String scoreClassId);
+
+    /**
+     * 根据班级id查询最新一次考试id
+     * @param scoreClassId
+     * @return
+     */
+    public ScoreData selectScoreIdByScoreClassId(String scoreClassId);
+
+    /**
+     * 查询成绩列表
+     *
+     * @param scoreData 成绩
+     * @return 成绩集合
+     */
+    public List<ScoreData> selectScoreDataList(ScoreData scoreData);
+    //查询该次考试总人数
+    public int   selectDetailsCountByScoreId(Long scoreId);
+
+    /**
+     * 新增成绩
+     *
+     * @param scoreData 成绩
+     * @return 结果
+     */
+    public int insertScoreData(ScoreData scoreData);
+
+    /**
+     * 修改成绩
+     *
+     * @param scoreData 成绩
+     * @return 结果
+     */
+    public int updateScoreData(ScoreData scoreData);
+
+    /**
+     * 删除成绩
+     *
+     * @param scoreId 成绩主键
+     * @return 结果
+     */
+    public int deleteScoreDataByScoreId(Long scoreId);
+
+    /**
+     * 批量删除成绩
+     *
+     * @param scoreIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteScoreDataByScoreIds(Long[] scoreIds);
+
+    /**
+     * 批量删除成绩_子
+     *
+     * @param scoreIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteScoreDataDetailsByScoreIds(Long[] scoreIds);
+
+    /**
+     * 批量新增成绩_子
+     *
+     * @param scoreDataDetailsList 成绩_子列表
+     * @return 结果
+     */
+    public int batchScoreDataDetails(List<ScoreDataDetails> scoreDataDetailsList);
+
+
+    /**
+     * 通过成绩主键删除成绩_子信息
+     *
+     * @param scoreId 成绩ID
+     * @return 结果
+     */
+    public int deleteScoreDataDetailsByScoreId(Long scoreId);
+}

+ 18 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAppletService.java

@@ -0,0 +1,18 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+
+/**
+ * @Author: tjf
+ * @Date: 2023/5/25 11:47
+ * @Describe:
+ */
+public interface IAppletService {
+    public AjaxResult xiake(FormalTeacherClass formalTeacherClass);
+    public AjaxResult xiaKeTime(FormalTeacherClass formalTeacherClass);
+    public AjaxResult index(FormalTeacherClass formalTeacherClass);
+    public AjaxResult indexList(FormalTeacherClass formalTeacherClass);
+
+    AjaxResult pcStatistics();
+}

+ 67 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICourseChangeService.java

@@ -0,0 +1,67 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.CourseChange;
+
+import java.util.List;
+
+/**
+ * 调课Service接口
+ *
+ * @author ruoyi
+ * @date 2023-06-02
+ */
+public interface ICourseChangeService
+{
+    /**
+     * 查询调课
+     *
+     * @param id 调课主键
+     * @return 调课
+     */
+    public CourseChange selectCourseChangeById(Long id);
+
+    /**
+     * 查询调课列表
+     *
+     * @param courseChange 调课
+     * @return 调课集合
+     */
+    public List<CourseChange> selectCourseChangeList(CourseChange courseChange);
+
+    /**
+     * 新增调课
+     *
+     * @param courseChange 调课
+     * @return 结果
+     */
+    public AjaxResult insertCourseChange(CourseChange courseChange);
+
+    /**
+     * 修改调课
+     *
+     * @param courseChange 调课
+     * @return 结果
+     */
+    public int updateCourseChange(CourseChange courseChange);
+
+    /**
+     * 批量删除调课
+     *
+     * @param ids 需要删除的调课主键集合
+     * @return 结果
+     */
+    public int deleteCourseChangeByIds(Long[] ids);
+
+    /**
+     * 删除调课信息
+     *
+     * @param id 调课主键
+     * @return 结果
+     */
+    public int deleteCourseChangeById(Long id);
+
+    AjaxResult updateCourseChangeReply(CourseChange courseChange);
+
+    List<CourseChange> courseList(CourseChange courseChange);
+}

+ 65 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICourseTableService.java

@@ -0,0 +1,65 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.CourseTable;
+
+import java.util.List;
+
+/**
+ * 课程Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface ICourseTableService
+{
+    /**
+     * 查询课程
+     *
+     * @param id 课程主键
+     * @return 课程
+     */
+    public CourseTable selectCourseTableById(Long id);
+
+    /**
+     * 查询课程列表
+     *
+     * @param courseTable 课程
+     * @return 课程集合
+     */
+    public List<CourseTable> selectCourseTableList(CourseTable courseTable);
+
+    /**
+     * 新增课程
+     *
+     * @param courseTable 课程
+     * @return 结果
+     */
+    public AjaxResult insertCourseTable(CourseTable courseTable);
+
+    /**
+     * 修改课程
+     *
+     * @param courseTable 课程
+     * @return 结果
+     */
+    public int updateCourseTable(CourseTable courseTable);
+
+    /**
+     * 批量删除课程
+     *
+     * @param ids 需要删除的课程主键集合
+     * @return 结果
+     */
+    public int deleteCourseTableByIds(Long[] ids);
+
+    /**
+     * 删除课程信息
+     *
+     * @param id 课程主键
+     * @return 结果
+     */
+    public int deleteCourseTableById(Long id);
+
+    AjaxResult now(Long schoolId,Long classId);
+}

+ 62 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ICourseTableTimeService.java

@@ -0,0 +1,62 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.CourseTableTime;
+
+import java.util.List;
+
+/**
+ * 课程-时间Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+public interface ICourseTableTimeService
+{
+    /**
+     * 查询课程-时间
+     *
+     * @param id 课程-时间主键
+     * @return 课程-时间
+     */
+    public CourseTableTime selectCourseTableTimeById(Long id);
+
+    /**
+     * 查询课程-时间列表
+     *
+     * @param courseTableTime 课程-时间
+     * @return 课程-时间集合
+     */
+    public List<CourseTableTime> selectCourseTableTimeList(CourseTableTime courseTableTime);
+
+    /**
+     * 新增课程-时间
+     *
+     * @param courseTableTime 课程-时间
+     * @return 结果
+     */
+    public int insertCourseTableTime(CourseTableTime courseTableTime);
+
+    /**
+     * 修改课程-时间
+     *
+     * @param courseTableTime 课程-时间
+     * @return 结果
+     */
+    public int updateCourseTableTime(CourseTableTime courseTableTime);
+
+    /**
+     * 批量删除课程-时间
+     *
+     * @param ids 需要删除的课程-时间主键集合
+     * @return 结果
+     */
+    public int deleteCourseTableTimeByIds(Long[] ids);
+
+    /**
+     * 删除课程-时间信息
+     *
+     * @param id 课程-时间主键
+     * @return 结果
+     */
+    public int deleteCourseTableTimeById(Long id);
+}

+ 64 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFormalParentsStudentService.java

@@ -0,0 +1,64 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+
+import java.util.List;
+
+/**
+ * 家长-学生(审核通过之后数据)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);
+
+    List<FormalParentsStudent> selectFormalParentsStudentListNoPage(FormalParentsStudent formalParentsStudent);
+}

+ 70 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFormalTeacherClassService.java

@@ -0,0 +1,70 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+import com.ruoyi.common.core.domain.entity.vo.FormalTeacherClassVo;
+
+import java.util.List;
+
+/**
+ * 老师-班级(学科)(审核通过之后数据)Service接口
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+public interface IFormalTeacherClassService
+{
+    /**
+     * 查询老师-班级(学科)(审核通过之后数据)
+     *
+     * @param id 老师-班级(学科)(审核通过之后数据)主键
+     * @return 老师-班级(学科)(审核通过之后数据)
+     */
+    public FormalTeacherClass selectFormalTeacherClassById(Long id);
+
+    /**
+     * 查询老师-班级(学科)(审核通过之后数据)列表
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 老师-班级(学科)(审核通过之后数据)集合
+     */
+    public List<FormalTeacherClass> selectFormalTeacherClassList(FormalTeacherClass formalTeacherClass);
+
+    /**
+     * 新增老师-班级(学科)(审核通过之后数据)
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 结果
+     */
+    public int insertFormalTeacherClass(FormalTeacherClass formalTeacherClass);
+
+    /**
+     * 修改老师-班级(学科)(审核通过之后数据)
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 结果
+     */
+    public int updateFormalTeacherClass(FormalTeacherClass formalTeacherClass);
+
+    /**
+     * 批量删除老师-班级(学科)(审核通过之后数据)
+     *
+     * @param ids 需要删除的老师-班级(学科)(审核通过之后数据)主键集合
+     * @return 结果
+     */
+    public int deleteFormalTeacherClassByIds(Long[] ids);
+
+    /**
+     * 删除老师-班级(学科)(审核通过之后数据)信息
+     *
+     * @param id 老师-班级(学科)(审核通过之后数据)主键
+     * @return 结果
+     */
+    public int deleteFormalTeacherClassById(Long id);
+
+    public List<FormalTeacherClass> getTeacherClass(String teacherId);
+
+    AjaxResult updateFormalTeacherClassList(FormalTeacherClassVo formalTeacherClassVo);
+
+    List<FormalTeacherClass> selectFormalTeacherClassListNoPage(FormalTeacherClass formalTeacherClass);
+}

+ 70 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRecordLeaveService.java

@@ -0,0 +1,70 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.RecordLeave;
+
+import java.util.List;
+
+/**
+ * 请假记录信息Service接口
+ *
+ * @author boman
+ * @date 2023-08-08
+ */
+public interface IRecordLeaveService
+{
+    /**
+     * 查询请假记录信息
+     *
+     * @param id 请假记录信息主键
+     * @return 请假记录信息
+     */
+    public RecordLeave selectRecordLeaveById(Long id);
+
+    /**
+     * 查询请假记录信息列表
+     *
+     * @param recordLeave 请假记录信息
+     * @return 请假记录信息集合
+     */
+    public List<RecordLeave> selectRecordLeaveList(RecordLeave recordLeave);
+
+    /**
+     * app请假记录数量通知
+     * @param recordLeave
+     * @return
+     */
+    public AjaxResult selectRecordLeaveNum(RecordLeave recordLeave);
+
+    /**
+     * 新增请假记录信息
+     *
+     * @param recordLeave 请假记录信息
+     * @return 结果
+     */
+    public int insertRecordLeave(RecordLeave recordLeave);
+
+    /**
+     * 修改请假记录信息
+     *
+     * @param recordLeave 请假记录信息
+     * @return 结果
+     */
+    public int updateRecordLeave(RecordLeave recordLeave);
+
+    /**
+     * 批量删除请假记录信息
+     *
+     * @param ids 需要删除的请假记录信息主键集合
+     * @return 结果
+     */
+    public int deleteRecordLeaveByIds(Long[] ids);
+
+    /**
+     * 删除请假记录信息信息
+     *
+     * @param id 请假记录信息主键
+     * @return 结果
+     */
+    public int deleteRecordLeaveById(Long id);
+}

+ 63 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterParentsService.java

@@ -0,0 +1,63 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.RegisterParents;
+
+import java.util.List;
+
+/**
+ * 注册-家长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);
+}

+ 62 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterParentsStudentService.java

@@ -0,0 +1,62 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.RegisterParentsStudent;
+
+import java.util.List;
+
+/**
+ * 注册-家长-学生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);
+}

+ 62 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterSchoolFileService.java

@@ -0,0 +1,62 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.RegisterSchoolFile;
+
+import java.util.List;
+
+/**
+ * 注册-学校-附件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);
+}

+ 65 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterSchoolService.java

@@ -0,0 +1,65 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.RegisterSchool;
+
+import java.util.List;
+
+/**
+ * 注册-学校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 phonenumber);
+}

+ 62 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterTeacherClassService.java

@@ -0,0 +1,62 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.RegisterTeacherClass;
+
+import java.util.List;
+
+/**
+ * 注册-老师-班级(学科)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);
+}

+ 63 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IRegisterTeacherService.java

@@ -0,0 +1,63 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.RegisterTeacher;
+
+import java.util.List;
+
+/**
+ * 注册-老师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);
+}

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

@@ -0,0 +1,66 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.StudentInfoOld;
+import com.ruoyi.system.domain.StudentLiveOld;
+
+import java.util.List;
+
+/**
+ * 学生档案历史信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-28
+ */
+public interface IStudentInfoOldService
+{
+    /**
+     * 查询学生档案历史信息
+     *
+     * @param id 学生档案历史信息主键
+     * @return 学生档案历史信息
+     */
+    public StudentInfoOld selectStudentInfoOldById(Long id);
+
+    /**
+     * 查询学生档案历史信息列表
+     *
+     * @param studentInfoOld 学生档案历史信息
+     * @return 学生档案历史信息集合
+     */
+    public List<StudentInfoOld> selectStudentInfoOldList(StudentInfoOld studentInfoOld);
+
+    /**
+     * 新增学生档案历史信息
+     *
+     * @param studentInfoOld 学生档案历史信息
+     * @return 结果
+     */
+    public int insertStudentInfoOld(StudentInfoOld studentInfoOld);
+
+    /**
+     * 修改学生档案历史信息
+     *
+     * @param studentInfoOld 学生档案历史信息
+     * @return 结果
+     */
+    public int updateStudentInfoOld(StudentInfoOld studentInfoOld);
+
+    /**
+     * 批量删除学生档案历史信息
+     *
+     * @param ids 需要删除的学生档案历史信息主键集合
+     * @return 结果
+     */
+    public int deleteStudentInfoOldByIds(Long[] ids);
+
+    /**
+     * 删除学生档案历史信息信息
+     *
+     * @param id 学生档案历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentInfoOldById(Long id);
+
+    AjaxResult selectStudentInfoOldListEcharts(StudentLiveOld studentLiveOld);
+}

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

@@ -0,0 +1,65 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.StudentInfo;
+
+import java.util.List;
+
+/**
+ * 学生档案信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+public interface IStudentInfoService
+{
+    /**
+     * 查询学生档案信息
+     *
+     * @param id 学生档案信息主键
+     * @return 学生档案信息
+     */
+    public StudentInfo selectStudentInfoById(Long id);
+
+    /**
+     * 查询学生档案信息列表
+     *
+     * @param studentInfo 学生档案信息
+     * @return 学生档案信息集合
+     */
+    public List<StudentInfo> selectStudentInfoList(StudentInfo studentInfo);
+
+    /**
+     * 新增学生档案信息
+     *
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public AjaxResult insertStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 修改学生档案信息
+     *
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public int updateStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 批量删除学生档案信息
+     *
+     * @param ids 需要删除的学生档案信息主键集合
+     * @return 结果
+     */
+    public int deleteStudentInfoByIds(Long[] ids);
+
+    /**
+     * 删除学生档案信息信息
+     *
+     * @param id 学生档案信息主键
+     * @return 结果
+     */
+    public int deleteStudentInfoById(Long id);
+
+    AjaxResult statistics(StudentInfo studentInfo);
+}

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

@@ -0,0 +1,62 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.StudentLiveOld;
+
+import java.util.List;
+
+/**
+ * 学生生活历史信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface IStudentLiveOldService
+{
+    /**
+     * 查询学生生活历史信息
+     *
+     * @param liveId 学生生活历史信息主键
+     * @return 学生生活历史信息
+     */
+    public StudentLiveOld selectStudentLiveOldByLiveId(Long liveId);
+
+    /**
+     * 查询学生生活历史信息列表
+     *
+     * @param studentLiveOld 学生生活历史信息
+     * @return 学生生活历史信息集合
+     */
+    public List<StudentLiveOld> selectStudentLiveOldList(StudentLiveOld studentLiveOld);
+
+    /**
+     * 新增学生生活历史信息
+     *
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int insertStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 修改学生生活历史信息
+     *
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int updateStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 批量删除学生生活历史信息
+     *
+     * @param liveIds 需要删除的学生生活历史信息主键集合
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveIds(Long[] liveIds);
+
+    /**
+     * 删除学生生活历史信息信息
+     *
+     * @param liveId 学生生活历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveId(Long liveId);
+}

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

@@ -0,0 +1,62 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.StudentMindOld;
+
+import java.util.List;
+
+/**
+ * 学生心理健康历史信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface IStudentMindOldService
+{
+    /**
+     * 查询学生心理健康历史信息
+     *
+     * @param mindId 学生心理健康历史信息主键
+     * @return 学生心理健康历史信息
+     */
+    public StudentMindOld selectStudentMindOldByMindId(Long mindId);
+
+    /**
+     * 查询学生心理健康历史信息列表
+     *
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 学生心理健康历史信息集合
+     */
+    public List<StudentMindOld> selectStudentMindOldList(StudentMindOld studentMindOld);
+
+    /**
+     * 新增学生心理健康历史信息
+     *
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int insertStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 修改学生心理健康历史信息
+     *
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int updateStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 批量删除学生心理健康历史信息
+     *
+     * @param mindIds 需要删除的学生心理健康历史信息主键集合
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindIds(Long[] mindIds);
+
+    /**
+     * 删除学生心理健康历史信息信息
+     *
+     * @param mindId 学生心理健康历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindId(Long mindId);
+}

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

@@ -0,0 +1,63 @@
+package org.dromara.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.TeacherInfo;
+
+import java.util.List;
+
+/**
+ * 老师档案信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+public interface ITeacherInfoService
+{
+    /**
+     * 查询老师档案信息
+     *
+     * @param id 老师档案信息主键
+     * @return 老师档案信息
+     */
+    public TeacherInfo selectTeacherInfoById(Long id);
+
+    /**
+     * 查询老师档案信息列表
+     *
+     * @param teacherInfo 老师档案信息
+     * @return 老师档案信息集合
+     */
+    public List<TeacherInfo> selectTeacherInfoList(TeacherInfo teacherInfo);
+
+    /**
+     * 新增老师档案信息
+     *
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public AjaxResult insertTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 修改老师档案信息
+     *
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public int updateTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 批量删除老师档案信息
+     *
+     * @param ids 需要删除的老师档案信息主键集合
+     * @return 结果
+     */
+    public int deleteTeacherInfoByIds(Long[] ids);
+
+    /**
+     * 删除老师档案信息信息
+     *
+     * @param id 老师档案信息主键
+     * @return 结果
+     */
+    public int deleteTeacherInfoById(Long id);
+}

+ 76 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IXiakeConfigService.java

@@ -0,0 +1,76 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.XiakeConfig;
+
+/**
+ * 参数配置 服务层
+ *
+ * @author ruoyi
+ */
+public interface IXiakeConfigService
+{
+    /**
+     * 查询参数配置信息
+     *
+     * @param configId 参数配置ID
+     * @return 参数配置信息
+     */
+    public XiakeConfig selectConfigById(Long configId);
+
+    /**
+     * 根据键名查询参数配置信息
+     *
+     * @param config 参数键名
+     * @return 参数键值
+     */
+    public String selectConfigByKey(XiakeConfig config);
+
+
+
+    /**
+     * 新增参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int insertConfig(XiakeConfig config);
+
+    /**
+     * 修改参数配置
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    public int updateConfig(XiakeConfig config);
+    public int updateConfigValue(XiakeConfig config);
+
+    /**
+     * 批量删除参数信息
+     *
+     * @param configIds 需要删除的参数ID
+     */
+    public void deleteConfigByIds(Long[] configIds);
+
+    /**
+     * 加载参数缓存数据
+     */
+    public void loadingConfigCache();
+
+    /**
+     * 清空参数缓存数据
+     */
+    public void clearConfigCache();
+
+    /**
+     * 重置参数缓存数据
+     */
+    public void resetConfigCache();
+
+    /**
+     * 校验参数键名是否唯一
+     *
+     * @param config 参数信息
+     * @return 结果
+     */
+    public boolean checkConfigKeyUnique(XiakeConfig config);
+}

+ 64 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IXiaoyuanNoticeService.java

@@ -0,0 +1,64 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.XiaoyuanNotice;
+
+import java.util.List;
+
+/**
+ * 校园新闻Service接口
+ *
+ * @author boman
+ * @date 2023-06-05
+ */
+public interface IXiaoyuanNoticeService
+{
+    /**
+     * 查询校园新闻
+     *
+     * @param noticeId 校园新闻主键
+     * @return 校园新闻
+     */
+    public XiaoyuanNotice selectXiaoyuanNoticeByNoticeId(Integer noticeId);
+
+    /**
+     * 查询校园新闻列表
+     *
+     * @param xiaoyuanNotice 校园新闻
+     * @return 校园新闻集合
+     */
+    public List<XiaoyuanNotice> selectXiaoyuanNoticeList(XiaoyuanNotice xiaoyuanNotice);
+    public List<XiaoyuanNotice> selectXiaoyuanNoticeMyList(XiaoyuanNotice xiaoyuanNotice);
+    public List<XiaoyuanNotice> myCollect(XiaoyuanNotice xiaoyuanNotice);
+
+    /**
+     * 新增校园新闻
+     *
+     * @param xiaoyuanNotice 校园新闻
+     * @return 结果
+     */
+    public int insertXiaoyuanNotice(XiaoyuanNotice xiaoyuanNotice);
+
+    /**
+     * 修改校园新闻
+     *
+     * @param xiaoyuanNotice 校园新闻
+     * @return 结果
+     */
+    public int updateXiaoyuanNotice(XiaoyuanNotice xiaoyuanNotice);
+
+    /**
+     * 批量删除校园新闻
+     *
+     * @param noticeIds 需要删除的校园新闻主键集合
+     * @return 结果
+     */
+    public int deleteXiaoyuanNoticeByNoticeIds(Integer[] noticeIds);
+
+    /**
+     * 删除校园新闻信息
+     *
+     * @param noticeId 校园新闻主键
+     * @return 结果
+     */
+    public int deleteXiaoyuanNoticeByNoticeId(Integer noticeId);
+}

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

@@ -0,0 +1,62 @@
+package org.dromara.system.service;
+
+import com.ruoyi.system.domain.ZhxyShyj;
+
+import java.util.List;
+
+/**
+ * 智慧校园_审核意见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);
+}

+ 320 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AppletServiceImpl.java

@@ -0,0 +1,320 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+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.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.domain.XiakeConfig;
+import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.system.mapper.XiakeConfigMapper;
+import com.ruoyi.system.service.IAppletService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: tjf
+ * @Date: 2023/5/25 11:48
+ * @Describe:
+ */
+@Service
+public class AppletServiceImpl implements IAppletService {
+    @Autowired
+    private RedisCache redisCache;
+
+    @Autowired
+    private XiakeConfigMapper xiakeConfigMapper;
+
+    @Autowired
+    private SysConfigMapper configMapper;
+    @Autowired
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+
+    @Autowired
+    private CourseChangeMapper courseChangeMapper;
+
+    @Autowired
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+
+    @Autowired
+    private RegisterTeacherMapper registerTeacherMapper;
+
+    @Autowired
+    private XiaoyuanNoticeMapper xiaoyuanNoticeMapper;
+
+    /**
+     * 老师准备下课按钮
+     *
+     * @param formalTeacherClass
+     */
+    @Override
+    public AjaxResult xiake(FormalTeacherClass formalTeacherClass) {
+        String key = formalTeacherClass.getSchoolId() + ":" + formalTeacherClass.getClassId();
+        //key = 学校id:班级id
+        //Redis根据key键,查询对应的值
+        String value = redisCache.getCacheObject(key);
+        if ("2".equals(formalTeacherClass.getType())) {
+            if (value.contains("time")) {
+                return AjaxResult.error("未准备放学,请勿点击延迟放学");
+            } else {
+                //延迟放学
+                String[] split = value.split(":");
+                //下课时间
+                String xiakeTime = split[1];
+                //获取参数中默认下课时间
+                XiakeConfig config = new XiakeConfig();
+                config.setConfigKey(formalTeacherClass.getClassId()+":2");
+                XiakeConfig retConfig = xiakeConfigMapper.selectConfig(config);
+                //延迟下课的默认值
+                String configValue = retConfig.getConfigValue();
+                SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = null;
+                try {
+                    date = sdf.parse(xiakeTime);
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(date);
+                    calendar.add(Calendar.MINUTE, Integer.parseInt(configValue));
+                    redisCache.setCacheObject(key, value);
+                    return AjaxResult.success("延迟放学成功");
+                } catch (ParseException e) {
+                    return AjaxResult.error("延迟放学失败");
+                }
+            }
+        }
+        if ("1".equals(formalTeacherClass.getType())) {
+            if (!value.contains("time")) {
+                return AjaxResult.error("请勿重复点击");
+            }
+            //value = 班级名称:放学时间
+            //获取当前时间
+            Calendar nowTime = Calendar.getInstance();
+            //获取参数中默认下课时间
+            XiakeConfig config = new XiakeConfig();
+            config.setConfigKey(formalTeacherClass.getClassId()+":1");
+            XiakeConfig retConfig = xiakeConfigMapper.selectConfig(config);
+            String configValue = retConfig.getConfigValue();
+            nowTime.add(Calendar.MINUTE, Integer.parseInt(configValue));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            value = value.replace("time", sdf.format(nowTime.getTime()));
+            redisCache.setCacheObject(key, value);
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 家长获取下课时间
+     * @param formalTeacherClass
+     * @return
+     */
+    @Override
+    public AjaxResult xiaKeTime(FormalTeacherClass formalTeacherClass) {
+        String key = formalTeacherClass.getSchoolId() + ":" + formalTeacherClass.getClassId();
+        //key = 学校id:班级id
+        //Redis根据key键,查询对应的值
+        String value = redisCache.getCacheObject(key);
+        String[] split = value.split(":");
+        //下课时间
+        String xiakeTime = split[1];
+        return AjaxResult.success(xiakeTime);
+    }
+
+    @Override
+    public AjaxResult index(FormalTeacherClass formalTeacherClass) {
+        Map<String, Object> map = new HashMap<>(3);
+        map.put("all", 0);
+        Collection<String> keys = redisCache.keys(formalTeacherClass.getSchoolId() + "*");
+        if (keys != null && keys.size() > 0) {
+            map.put("all", keys.size());
+            map.put("n", 0);
+            map.put("y", 0);
+            int n = 0;
+            for (String key : keys) {
+                //Redis根据key键,查询对应的值
+                String value = redisCache.getCacheObject(key);
+                //value = 班级名称:放学时间
+                //判断有多少放学时间是time,占位符
+                String[] split = value.split(":");
+                String time = split[1];
+                if ("time".equals(time)) {
+                    n = n + 1;
+                }
+            }
+            if (n > 0) {
+                map.put("n", n);
+                int y = keys.size() - n;
+                map.put("y", Math.max(y, 0));
+            }
+        }
+        return AjaxResult.success(map);
+    }
+
+    @Override
+    public AjaxResult indexList(FormalTeacherClass formalTeacherClass) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        Collection<String> keys = redisCache.keys(formalTeacherClass.getSchoolId() + "*");
+        if (keys != null && keys.size() > 0) {
+            for (String key : keys) {
+                String value = redisCache.getCacheObject(key);
+                //value = 班级名称:放学时间
+                String[] split = value.split(":");
+                Map<String, Object> map = new HashMap<>();
+                map.put("className", split[0]);
+                map.put("time", split[1]);
+                list.add(map);
+            }
+        }
+        return AjaxResult.success(list);
+    }
+
+    @Override
+    public AjaxResult pcStatistics() {
+        Map<String, Object> map = new HashMap<>();
+        //获取当前月第一天
+        String monthFirst = DateUtils.timeMonthFirst();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<SysRole> roles = user.getRoles();
+        boolean blt = false;
+        boolean bls = false;
+        for (SysRole role : roles) {
+            if ("teacher".equals(role.getRoleKey())) {
+                blt = true;
+            }
+            if ("school".equals(role.getRoleKey())) {
+                bls = true;
+            }
+        }
+        //账号
+        int tzhysh = 0;
+        int tzhwsh = 0;
+        //调课
+        int ttkysh = 0;
+        int ttkwsh = 0;
+        Map<String,Object> map1 = new HashMap<>();
+        Map<String,Object> map2 = new HashMap<>();
+        Map<String,Object> map3 = new HashMap<>();
+
+        //计算本人
+        XiaoyuanNotice xiaoyuanNotice = new XiaoyuanNotice();
+        xiaoyuanNotice.setSenderId(String.valueOf(user.getUserId()));
+        List<XiaoyuanNotice> xiaoyuanNoticeList = xiaoyuanNoticeMapper.selectXiaoyuanNoticeMyList(xiaoyuanNotice);
+        int xwsl = 0;
+        if(xiaoyuanNoticeList!=null && xiaoyuanNoticeList.size()>0){
+            xwsl = xiaoyuanNoticeList.size();
+        }
+        map.put("xwsl",xwsl);
+
+        map1.put("zhysh",tzhysh);
+        map1.put("zhwsh",tzhwsh);
+        map.put("byzhsh",map1);
+        map2.put("tkysh",ttkysh);
+        map2.put("tkwsh",ttkwsh);
+        map.put("bytksh",map2);
+
+        //老师
+        if(blt){
+            //获取老师所属班级
+            FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+            formalTeacherClass.setTeacherId(user.getUserId());
+            List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+            List<Long> classIds = formalTeacherClasses.stream().map(FormalTeacherClass::getClassId).collect(Collectors.toList());
+            //查询本月家长的审核数据
+            List<RegisterParentsStudent> registerParentsStudentList = registerParentsStudentMapper.selectRegisterParentsStudentListByTime(monthFirst,classIds);
+            if(registerParentsStudentList!=null && registerParentsStudentList.size()>0){
+                for (RegisterParentsStudent registerParentsStudent : registerParentsStudentList) {
+                    if("1".equals(registerParentsStudent.getIsPass())){
+                        tzhwsh++;
+                    }else{
+                        tzhysh++;
+                    }
+                }
+            }
+            //查询本月调课审核
+            List<CourseChange> courseChangeList = courseChangeMapper.selectCourseChangeListByTime(monthFirst,user.getUserId(),0L);
+            if(courseChangeList!=null && courseChangeList.size()>0){
+                for (CourseChange courseChange : courseChangeList) {
+                    if("1".equals(courseChange.getIsPass())){
+                        ttkwsh++;
+                    }else{
+                        ttkysh++;
+                    }
+                }
+            }
+            map1.put("zhysh",tzhysh);
+            map1.put("zhwsh",tzhwsh);
+            map.put("byzhsh",map1);
+            map2.put("tkysh",ttkysh);
+            map2.put("tkwsh",ttkwsh);
+            map.put("bytksh",map2);
+
+        }
+
+
+        //学校
+        //账号
+        int szhysh = 0;
+        int szhwsh = 0;
+        //调课
+        int stkysh = 0;
+        int stkwsh = 0;
+        if(bls){
+            //查询本月老师的审核数据
+            List<RegisterTeacher> registerTeacherList = registerTeacherMapper.selectRegisterTeacherListByTime(monthFirst,user.getDeptId());
+            if(registerTeacherList!=null && registerTeacherList.size()>0){
+                for (RegisterTeacher registerTeacher : registerTeacherList) {
+                    if("1".equals(registerTeacher.getIsPass())){
+                        szhysh++;
+                    }else{
+                        szhwsh++;
+                    }
+                }
+            }
+            //查询本月学校的调课审核
+            List<CourseChange> courseChangeList = courseChangeMapper.selectCourseChangeListByTime(monthFirst,0L,user.getDeptId());
+            if(courseChangeList!=null && courseChangeList.size()>0){
+                for (CourseChange courseChange : courseChangeList) {
+                    if("1".equals(courseChange.getIsPass())){
+                        stkysh++;
+                    }else{
+                        stkwsh++;
+                    }
+                }
+            }
+
+            map1.put("zhysh",szhysh);
+            map1.put("zhwsh",szhwsh);
+            map.put("byzhsh",map1);
+            map2.put("tkysh",stkysh);
+            map2.put("tkwsh",stkwsh);
+            map.put("bytksh",map2);
+        }
+        //两个都有
+
+        if(blt && bls){
+
+            //账号
+            int zzhysh = tzhysh + szhysh;
+            int zzhwsh = tzhwsh + szhwsh;
+            //调课
+            int ztkysh =  stkysh;
+            int ztkwsh =  stkwsh;
+
+            map1.put("zhysh",zzhysh);
+            map1.put("zhwsh",zzhwsh);
+            map.put("byzhsh",map1);
+            map2.put("tkysh",ztkysh);
+            map2.put("tkwsh",ztkwsh);
+            map.put("bytksh",map2);
+
+        }
+        return AjaxResult.success(map);
+    }
+}

+ 212 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseChangeServiceImpl.java

@@ -0,0 +1,212 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.*;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.CourseChange;
+import com.ruoyi.system.mapper.CourseChangeMapper;
+import com.ruoyi.system.mapper.FormalParentsStudentMapper;
+import com.ruoyi.system.mapper.FormalTeacherClassMapper;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.service.ICourseChangeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 调课Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-06-02
+ */
+@Service
+public class CourseChangeServiceImpl implements ICourseChangeService {
+    @Autowired
+    private CourseChangeMapper courseChangeMapper;
+    @Autowired
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+    @Autowired
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+    @Autowired
+    private SysDeptMapper deptMapper;
+
+    /**
+     * 查询调课
+     *
+     * @param id 调课主键
+     * @return 调课
+     */
+    @Override
+    public CourseChange selectCourseChangeById(Long id) {
+        return courseChangeMapper.selectCourseChangeById(id);
+    }
+
+    /**
+     * 查询调课列表
+     *
+     * @param courseChange 调课
+     * @return 调课
+     */
+    @Override
+    public List<CourseChange> selectCourseChangeList(CourseChange courseChange) {
+
+        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());
+            courseChange.setSubjectClassIds(classIds);
+            courseChange.setApplyId(user.getUserId());
+            courseChange.setBePersonnelId(user.getUserId());
+        }
+        return courseChangeMapper.selectCourseChangeList(courseChange);
+    }
+
+    @Override
+    public List<CourseChange> courseList(CourseChange courseChange) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<SysRole> roles = user.getRoles();
+        List<Long> classIdList = new ArrayList<>();
+        for (SysRole role : roles) {
+            if ("teacher".equals(role.getRoleKey())) {
+                //查询老师班级
+                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());
+                classIdList.addAll(classIds);
+            }
+            if("parents".equals(role.getRoleKey())){
+                FormalParentsStudent formalParentsStudent = new FormalParentsStudent();
+                formalParentsStudent.setParentsId(user.getUserId());
+                List<FormalParentsStudent> formalParentsStudentList = formalParentsStudentMapper.selectFormalParentsStudentList(formalParentsStudent);
+                List<Long> classIds = formalParentsStudentList.stream().map(FormalParentsStudent::getClassId).collect(Collectors.toList());
+                classIdList.addAll(classIds);
+            }
+            if("school".equals(role.getRoleKey())){
+                List<SysDept> depts = deptMapper.selectDeptListChildren(user.getDeptId());
+                List<Long> classIds = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                classIdList.addAll(classIds);
+            }
+        }
+        courseChange.setSubjectClassIds(classIdList);
+        return courseChangeMapper.selectCourseChangeList(courseChange);
+    }
+
+    /**
+     * 新增调课
+     *
+     * @param courseChange 调课
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertCourseChange(CourseChange courseChange) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+        formalTeacherClass.setTeacherId(user.getUserId());
+        List<FormalTeacherClass> formalTeacherClassList = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+        Boolean bl = false;
+        for (FormalTeacherClass teacherClass : formalTeacherClassList) {
+            if(courseChange.getSubjectClassId().equals(teacherClass.getClassId()) && courseChange.getSubject().equals(teacherClass.getDiscipline())){
+                bl = true;
+                break;
+            }
+        }
+        if(!bl){
+            return AjaxResult.error("请选择属于自己的课程。");
+        }
+        courseChange.setSchoolId(formalTeacherClassList.get(0).getSchoolId());
+        courseChange.setSchoolName(formalTeacherClassList.get(0).getSchoolName());
+        courseChange.setApplyId(user.getUserId());
+        courseChange.setApplyName(formalTeacherClassList.get(0).getTeacherName());
+        courseChange.setCreateTime(DateUtils.getNowDate());
+        //查询被调课的老师信息
+        FormalTeacherClass formalTeacherClassBe = new FormalTeacherClass();
+        formalTeacherClassBe.setClassId(courseChange.getSubjectClassId());
+        formalTeacherClassBe.setDiscipline(courseChange.getBeSubject());
+        List<FormalTeacherClass> formalTeacherClassBeList = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClassBe);
+        if(formalTeacherClassBeList==null || formalTeacherClassBeList.size()<=0){
+            return AjaxResult.error();
+        }
+        courseChange.setBePersonnel(formalTeacherClassBeList.get(0).getTeacherName());
+        courseChange.setBePersonnelId(formalTeacherClassBeList.get(0).getTeacherId());
+        courseChangeMapper.insertCourseChange(courseChange);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 修改调课
+     *
+     * @param courseChange 调课
+     * @return 结果
+     */
+    @Override
+    public int updateCourseChange(CourseChange courseChange) {
+        courseChange.setUpdateTime(DateUtils.getNowDate());
+        //查询被调课的老师信息
+        FormalTeacherClass formalTeacherClassBe = new FormalTeacherClass();
+        formalTeacherClassBe.setClassId(courseChange.getSubjectClassId());
+        formalTeacherClassBe.setDiscipline(courseChange.getBeSubject());
+        List<FormalTeacherClass> formalTeacherClassBeList = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClassBe);
+        courseChange.setBePersonnel(formalTeacherClassBeList.get(0).getTeacherName());
+        courseChange.setBePersonnelId(formalTeacherClassBeList.get(0).getTeacherId());
+        return courseChangeMapper.updateCourseChange(courseChange);
+    }
+
+    /**
+     * 批量删除调课
+     *
+     * @param ids 需要删除的调课主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCourseChangeByIds(Long[] ids) {
+        return courseChangeMapper.deleteCourseChangeByIds(ids);
+    }
+
+    /**
+     * 删除调课信息
+     *
+     * @param id 调课主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCourseChangeById(Long id) {
+        return courseChangeMapper.deleteCourseChangeById(id);
+    }
+
+    @Override
+    public AjaxResult updateCourseChangeReply(CourseChange courseChange) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        //判断当前老师是否有权限回复该信息
+        FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+        formalTeacherClass.setTeacherId(user.getUserId());
+        formalTeacherClass.setClassId(courseChange.getSubjectClassId());
+        formalTeacherClass.setDiscipline(courseChange.getBeSubject());
+        List<FormalTeacherClass> formalTeacherClassList = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+        if (formalTeacherClassList == null || formalTeacherClassList.size() <= 0) {
+            return AjaxResult.error("请回复自己授课的班级与课程");
+        }
+        courseChange.setAuditId(user.getUserId());
+        courseChange.setAuditUser(user.getNickName());
+        courseChange.setCreateTime(DateUtils.getNowDate());
+        courseChangeMapper.updateCourseChange(courseChange);
+        return AjaxResult.success();
+    }
+
+}

+ 304 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseTableServiceImpl.java

@@ -0,0 +1,304 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.CourseChange;
+import com.ruoyi.system.domain.CourseTable;
+import com.ruoyi.system.domain.CourseTableTime;
+import com.ruoyi.system.mapper.CourseChangeMapper;
+import com.ruoyi.system.mapper.CourseTableMapper;
+import com.ruoyi.system.mapper.CourseTableTimeMapper;
+import com.ruoyi.system.service.ICourseTableService;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * 课程Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+@Service
+public class CourseTableServiceImpl implements ICourseTableService {
+    @Autowired
+    private CourseTableMapper courseTableMapper;
+    @Autowired
+    private CourseTableTimeMapper courseTableTimeMapper;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @Autowired
+    private CourseChangeMapper courseChangeMapper;
+
+    /**
+     * 查询课程
+     *
+     * @param id 课程主键
+     * @return 课程
+     */
+    @Override
+    public CourseTable selectCourseTableById(Long id) {
+        return courseTableMapper.selectCourseTableById(id);
+    }
+
+    /**
+     * 查询课程列表
+     *
+     * @param courseTable 课程
+     * @return 课程
+     */
+    @SneakyThrows
+    @Override
+    public List<CourseTable> selectCourseTableList(CourseTable courseTable) {
+        if(StringUtils.isEmpty(courseTable.getClassId()) || StringUtils.isEmpty(courseTable.getSchoolId())){
+            return new ArrayList<>();
+        }
+        List<CourseTable> courseTableList = courseTableMapper.selectCourseTableList(courseTable);
+        //获取本周一和本周五的时间
+        String fist = DateUtils.getTimeIntervalOne(new Date());
+        String five = DateUtils.getTimeIntervalFive(fist);
+        List<CourseChange> courseChangeList = courseChangeMapper.selectCourseChangeListByEdit(courseTable.getClassId(), fist, five);
+        if (courseChangeList == null || courseChangeList.size() <=0){
+            return courseTableList;
+        }
+
+        for (CourseTable table : courseTableList) {
+            changeCourseTable(table,courseChangeList,fist,five);
+        }
+
+        return courseTableList;
+    }
+
+    @SneakyThrows
+    private void changeCourseTable(CourseTable table, List<CourseChange> courseChangeList, String fist, String five) {
+        String format = "yyyy-MM-dd";
+        Set<Long> classNum = new HashSet<>();
+        for (CourseChange courseChange : courseChangeList) {
+            //调课的时间是否在本周
+            if(DateUtils.isClass(fist,five,DateUtils.dateTime(courseChange.getSubjectTime()),format)){
+                if(StringUtils.equals(courseChange.getSubjectWeek(),table.getWeek())){
+                    classNum.add(Long.valueOf(courseChange.getIsNum()));
+                    //第几节课
+                    if(StringUtils.equals("1",courseChange.getIsNum())){
+                        table.setOneClass(courseChange.getBeSubject());
+                        table.setOneTeacher(courseChange.getBePersonnel());
+                    }else if(StringUtils.equals("2",courseChange.getIsNum())){
+                        table.setTwoClass(courseChange.getBeSubject());
+                        table.setTwoTeacher(courseChange.getBePersonnel());
+                    }else if(StringUtils.equals("3",courseChange.getIsNum())){
+                        table.setThreeClass(courseChange.getBeSubject());
+                        table.setThreeTeacher(courseChange.getBePersonnel());
+                    }else if(StringUtils.equals("4",courseChange.getIsNum())){
+                        table.setFourClass(courseChange.getBeSubject());
+                        table.setFourTeacher(courseChange.getBePersonnel());
+                    }else if(StringUtils.equals("5",courseChange.getIsNum())){
+                        table.setFiveClass(courseChange.getBeSubject());
+                        table.setFiveTeacher(courseChange.getBePersonnel());
+                    }else if(StringUtils.equals("6",courseChange.getIsNum())){
+                        table.setSixClass(courseChange.getBeSubject());
+                        table.setSixTeacher(courseChange.getBePersonnel());
+                    }else if(StringUtils.equals("7",courseChange.getIsNum())){
+                        table.setSevenClass(courseChange.getBeSubject());
+                        table.setSevenTeacher(courseChange.getBePersonnel());
+                    }else if(StringUtils.equals("8",courseChange.getIsNum())){
+                        table.setEightClass(courseChange.getBeSubject());
+                        table.setEightTeacher(courseChange.getBePersonnel());
+                    }
+                }
+            }
+            //被调课是否在本周
+            if(DateUtils.isClass(fist,five,DateUtils.dateTime(courseChange.getBeSubjectTime()),format)) {
+                if(StringUtils.equals(courseChange.getWeek(),table.getWeek())){
+                    classNum.add(Long.valueOf(courseChange.getBeIsNum()));
+                    //第几节课
+                    if(StringUtils.equals("1",courseChange.getBeIsNum())){
+                        table.setOneClass(courseChange.getSubject());
+                        table.setOneTeacher(courseChange.getApplyName());
+                    }else if(StringUtils.equals("2",courseChange.getBeIsNum())){
+                        table.setTwoClass(courseChange.getSubject());
+                        table.setTwoTeacher(courseChange.getApplyName());
+                    }else if(StringUtils.equals("3",courseChange.getBeIsNum())){
+                        table.setThreeClass(courseChange.getSubject());
+                        table.setThreeTeacher(courseChange.getApplyName());
+                    }else if(StringUtils.equals("4",courseChange.getBeIsNum())){
+                        table.setFourClass(courseChange.getSubject());
+                        table.setFourTeacher(courseChange.getApplyName());
+                    }else if(StringUtils.equals("5",courseChange.getBeIsNum())){
+                        table.setFiveClass(courseChange.getSubject());
+                        table.setFiveTeacher(courseChange.getApplyName());
+                    }else if(StringUtils.equals("6",courseChange.getBeIsNum())){
+                        table.setSixClass(courseChange.getSubject());
+                        table.setSixTeacher(courseChange.getApplyName());
+                    }else if(StringUtils.equals("7",courseChange.getBeIsNum())){
+                        table.setSevenClass(courseChange.getSubject());
+                        table.setSevenTeacher(courseChange.getApplyName());
+                    }else if(StringUtils.equals("8",courseChange.getBeIsNum())){
+                        table.setEightClass(courseChange.getSubject());
+                        table.setEightTeacher(courseChange.getApplyName());
+                    }
+                }
+            }
+        }
+        table.setClassNum(classNum);
+    }
+
+
+    /**
+     * 新增课程
+     *
+     * @param courseTable 课程
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertCourseTable(CourseTable courseTable) {
+
+        CourseTable table = new CourseTable();
+        table.setSchoolId(courseTable.getSchoolId());
+        table.setClassId(courseTable.getClassId());
+        table.setWeek(courseTable.getWeek());
+        List<CourseTable> courseTableList = courseTableMapper.selectCourseTableList(table);
+        if(courseTableList!=null && courseTableList.size()>0){
+            return AjaxResult.error("当前课表已存在,请前去修改");
+        }
+        courseTable.setCreateTime(DateUtils.getNowDate());
+        int rows = courseTableMapper.insertCourseTable(courseTable);
+
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改课程
+     *
+     * @param courseTable 课程
+     * @return 结果
+     */
+    @Override
+    public int updateCourseTable(CourseTable courseTable) {
+        courseTable.setUpdateTime(DateUtils.getNowDate());
+        return courseTableMapper.updateCourseTable(courseTable);
+    }
+
+    /**
+     * 批量删除课程
+     *
+     * @param ids 需要删除的课程主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCourseTableByIds(Long[] ids) {
+        return courseTableMapper.deleteCourseTableByIds(ids);
+    }
+
+    /**
+     * 删除课程信息
+     *
+     * @param id 课程主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCourseTableById(Long id) {
+        return courseTableMapper.deleteCourseTableById(id);
+    }
+
+    @SneakyThrows
+    @Override
+    public AjaxResult now(Long schoolId, Long classId) {
+        //SysUser user = SecurityUtils.getLoginUser().getUser();
+        Map<String, Object> map = new HashMap<>();
+        map.put("teacher", "");
+        map.put("subject", "");
+        //家长端查询下课时间
+        String key = schoolId + ":" + classId;
+        //key = 学校id:班级id
+        //Redis根据key键,查询对应的值
+        String xiakeTime = "";
+        String value = redisCache.getCacheObject(key);
+        if (StringUtils.isNotEmpty(value)) {
+            String[] split = value.split(":");
+            //下课时间
+            xiakeTime = split[1];
+        }
+        map.put("time", xiakeTime);
+        //获取当前时间
+        String nowTime = DateUtils.getTime();
+        //判断当天是周几
+        int dayForWeek = DateUtils.dayForWeek(nowTime);
+        if (dayForWeek == 6 || dayForWeek == 7) {
+            return AjaxResult.success(map);
+        }
+        //获取当前账号所属学校时间表
+        CourseTableTime courseTableTime = courseTableTimeMapper.selectCourseTableTimeBySchoolId(schoolId);
+        if (courseTableTime == null) {
+            return AjaxResult.success(map);
+        }
+        //判断当前时间是第几节课
+        int index = isClass(courseTableTime);
+        if (index == 0) {
+            return AjaxResult.success(map);
+        }
+        //获取当前班级课程
+        CourseTable courseTable = courseTableMapper.selectCourseTableByClassIdAndWeek(classId, dayForWeek);
+        if (courseTable == null) {
+            return AjaxResult.success(map);
+        }
+        if (index == 1) {
+            map.put("teacher", courseTable.getOneTeacher());
+            map.put("subject", courseTable.getOneClass());
+        } else if (index == 2) {
+            map.put("teacher", courseTable.getTwoTeacher());
+            map.put("subject", courseTable.getTwoClass());
+        } else if (index == 3) {
+            map.put("teacher", courseTable.getThreeTeacher());
+            map.put("subject", courseTable.getThreeClass());
+        } else if (index == 4) {
+            map.put("teacher", courseTable.getFourTeacher());
+            map.put("subject", courseTable.getFourClass());
+        } else if (index == 5) {
+            map.put("teacher", courseTable.getFiveTeacher());
+            map.put("subject", courseTable.getFiveClass());
+        } else if (index == 6) {
+            map.put("teacher", courseTable.getSixTeacher());
+            map.put("subject", courseTable.getSixClass());
+        } else if (index == 7) {
+            map.put("teacher", courseTable.getSevenTeacher());
+            map.put("subject", courseTable.getSevenClass());
+        } else if (index == 8) {
+            map.put("teacher", courseTable.getEightTeacher());
+            map.put("subject", courseTable.getEightClass());
+        }
+
+        return AjaxResult.success(map);
+    }
+
+    @SneakyThrows
+    private int isClass(CourseTableTime courseTableTime) {
+        //获取当前时间
+        String nowTime = DateUtils.getNowTime();
+        int index = 0;
+        if (StringUtils.isNotEmpty(courseTableTime.getOneStartTime()) && DateUtils.isClass(courseTableTime.getOneStartTime(), courseTableTime.getOneEndTime(), nowTime, "HH:mm")) {
+            index = 1;
+        } else if (StringUtils.isNotEmpty(courseTableTime.getTwoStartTime()) && DateUtils.isClass(courseTableTime.getTwoStartTime(), courseTableTime.getTwoEndTime(), nowTime, "HH:mm")) {
+            index = 2;
+        } else if (StringUtils.isNotEmpty(courseTableTime.getThreeStartTime()) && DateUtils.isClass(courseTableTime.getThreeStartTime(), courseTableTime.getThreeEndTime(), nowTime, "HH:mm")) {
+            index = 3;
+        } else if (StringUtils.isNotEmpty(courseTableTime.getFourStartTime()) && DateUtils.isClass(courseTableTime.getFourStartTime(), courseTableTime.getFourEndTime(), nowTime, "HH:mm")) {
+            index = 4;
+        } else if (StringUtils.isNotEmpty(courseTableTime.getFiveStartTime()) && DateUtils.isClass(courseTableTime.getFiveStartTime(), courseTableTime.getFiveEndTime(), nowTime, "HH:mm")) {
+            index = 5;
+        } else if (StringUtils.isNotEmpty(courseTableTime.getSixStartTime()) && DateUtils.isClass(courseTableTime.getSixStartTime(), courseTableTime.getSixEndTime(), nowTime, "HH:mm")) {
+            index = 6;
+        } else if (StringUtils.isNotEmpty(courseTableTime.getSevenStartTime()) && DateUtils.isClass(courseTableTime.getSevenStartTime(), courseTableTime.getSevenEndTime(), nowTime, "HH:mm")) {
+            index = 7;
+        } else if (StringUtils.isNotEmpty(courseTableTime.getEightStartTime()) && DateUtils.isClass(courseTableTime.getEightStartTime(), courseTableTime.getEightEndTime(), nowTime, "HH:mm")) {
+            index = 8;
+        }
+        return index;
+    }
+
+}

+ 97 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseTableTimeServiceImpl.java

@@ -0,0 +1,97 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.CourseTableTime;
+import com.ruoyi.system.mapper.CourseTableTimeMapper;
+import com.ruoyi.system.service.ICourseTableTimeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 课程-时间Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-24
+ */
+@Service
+public class CourseTableTimeServiceImpl implements ICourseTableTimeService
+{
+    @Autowired
+    private CourseTableTimeMapper courseTableTimeMapper;
+
+    /**
+     * 查询课程-时间
+     *
+     * @param id 课程-时间主键
+     * @return 课程-时间
+     */
+    @Override
+    public CourseTableTime selectCourseTableTimeById(Long id)
+    {
+        return courseTableTimeMapper.selectCourseTableTimeById(id);
+    }
+
+    /**
+     * 查询课程-时间列表
+     *
+     * @param courseTableTime 课程-时间
+     * @return 课程-时间
+     */
+    @Override
+    public List<CourseTableTime> selectCourseTableTimeList(CourseTableTime courseTableTime)
+    {
+        return courseTableTimeMapper.selectCourseTableTimeList(courseTableTime);
+    }
+
+    /**
+     * 新增课程-时间
+     *
+     * @param courseTableTime 课程-时间
+     * @return 结果
+     */
+    @Override
+    public int  insertCourseTableTime(CourseTableTime courseTableTime)
+    {
+        courseTableTime.setCreateTime(DateUtils.getNowDate());
+        return courseTableTimeMapper.insertCourseTableTime(courseTableTime);
+    }
+
+    /**
+     * 修改课程-时间
+     *
+     * @param courseTableTime 课程-时间
+     * @return 结果
+     */
+    @Override
+    public int updateCourseTableTime(CourseTableTime courseTableTime)
+    {
+        courseTableTime.setUpdateTime(DateUtils.getNowDate());
+        return courseTableTimeMapper.updateCourseTableTime(courseTableTime);
+    }
+
+    /**
+     * 批量删除课程-时间
+     *
+     * @param ids 需要删除的课程-时间主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCourseTableTimeByIds(Long[] ids)
+    {
+        return courseTableTimeMapper.deleteCourseTableTimeByIds(ids);
+    }
+
+    /**
+     * 删除课程-时间信息
+     *
+     * @param id 课程-时间主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCourseTableTimeById(Long id)
+    {
+        return courseTableTimeMapper.deleteCourseTableTimeById(id);
+    }
+}

+ 119 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FormalParentsStudentServiceImpl.java

@@ -0,0 +1,119 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.mapper.FormalParentsStudentMapper;
+import com.ruoyi.system.service.IFormalParentsStudentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 家长-学生(审核通过之后数据)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);
+    }
+
+    @Override
+    public List<FormalParentsStudent> selectFormalParentsStudentListNoPage(FormalParentsStudent formalParentsStudent) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+
+        if(!"admin".equals(user.getUserName())){
+            Map<String, Object> params = formalParentsStudent.getParams();
+            String role = "";
+            if (params != null && params.size() > 0) {
+                role = (String) params.get("role");
+            }
+
+            if("parents".equals(role)){
+                formalParentsStudent.setParentsId(user.getUserId());
+            }
+        }
+
+        return formalParentsStudentMapper.selectFormalParentsStudentList(formalParentsStudent);
+    }
+}

+ 138 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FormalTeacherClassServiceImpl.java

@@ -0,0 +1,138 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+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.common.utils.SecurityUtils;
+import com.ruoyi.system.mapper.FormalTeacherClassMapper;
+import com.ruoyi.system.service.IFormalTeacherClassService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 老师-班级(学科)(审核通过之后数据)Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-05-30
+ */
+@Service
+public class FormalTeacherClassServiceImpl implements IFormalTeacherClassService
+{
+    @Autowired
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+
+    /**
+     * 查询老师-班级(学科)(审核通过之后数据)
+     *
+     * @param id 老师-班级(学科)(审核通过之后数据)主键
+     * @return 老师-班级(学科)(审核通过之后数据)
+     */
+    @Override
+    public FormalTeacherClass selectFormalTeacherClassById(Long id)
+    {
+        return formalTeacherClassMapper.selectFormalTeacherClassById(id);
+    }
+
+    /**
+     * 查询老师-班级(学科)(审核通过之后数据)列表
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 老师-班级(学科)(审核通过之后数据)
+     */
+    @Override
+    public List<FormalTeacherClass> selectFormalTeacherClassList(FormalTeacherClass formalTeacherClass)
+    {
+        return formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+    }
+
+    /**
+     * 新增老师-班级(学科)(审核通过之后数据)
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 结果
+     */
+    @Override
+    public int insertFormalTeacherClass(FormalTeacherClass formalTeacherClass)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        formalTeacherClass.setTeacherId(user.getUserId());
+        formalTeacherClass.setTeacherName(user.getNickName());
+        formalTeacherClass.setCreateTime(DateUtils.getNowDate());
+        return formalTeacherClassMapper.insertFormalTeacherClass(formalTeacherClass);
+    }
+
+    /**
+     * 修改老师-班级(学科)(审核通过之后数据)
+     *
+     * @param formalTeacherClass 老师-班级(学科)(审核通过之后数据)
+     * @return 结果
+     */
+    @Override
+    public int updateFormalTeacherClass(FormalTeacherClass formalTeacherClass)
+    {
+        formalTeacherClass.setUpdateTime(DateUtils.getNowDate());
+        return formalTeacherClassMapper.updateFormalTeacherClass(formalTeacherClass);
+    }
+
+    /**
+     * 批量删除老师-班级(学科)(审核通过之后数据)
+     *
+     * @param ids 需要删除的老师-班级(学科)(审核通过之后数据)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFormalTeacherClassByIds(Long[] ids)
+    {
+        return formalTeacherClassMapper.deleteFormalTeacherClassByIds(ids);
+    }
+
+    /**
+     * 删除老师-班级(学科)(审核通过之后数据)信息
+     *
+     * @param id 老师-班级(学科)(审核通过之后数据)主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFormalTeacherClassById(Long id)
+    {
+        return formalTeacherClassMapper.deleteFormalTeacherClassById(id);
+    }
+
+    @Override
+    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();
+    }
+
+    @Override
+    public List<FormalTeacherClass> selectFormalTeacherClassListNoPage(FormalTeacherClass formalTeacherClass) {
+        if(formalTeacherClass.getClassId()==null || formalTeacherClass.getClassId()==0L ){
+            return new ArrayList<>();
+        }
+        return formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+    }
+}

+ 188 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RecordLeaveServiceImpl.java

@@ -0,0 +1,188 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.RecordLeave;
+import com.ruoyi.system.mapper.FormalParentsStudentMapper;
+import com.ruoyi.system.mapper.FormalTeacherClassMapper;
+import com.ruoyi.system.mapper.RecordLeaveMapper;
+import com.ruoyi.system.service.IRecordLeaveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static com.ruoyi.common.utils.PageUtils.startPage;
+
+/**
+ * 请假记录信息Service业务层处理
+ *
+ * @author boman
+ * @date 2023-08-08
+ */
+@Service
+public class RecordLeaveServiceImpl implements IRecordLeaveService
+{
+    @Autowired
+    private RecordLeaveMapper recordLeaveMapper;
+
+    @Autowired
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+
+    @Autowired
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+
+    /**
+     * 查询请假记录信息
+     *
+     * @param id 请假记录信息主键
+     * @return 请假记录信息
+     */
+    @Override
+    public RecordLeave selectRecordLeaveById(Long id)
+    {
+        RecordLeave recordLeave = recordLeaveMapper.selectRecordLeaveById(id);
+
+        //更新为查看
+        RecordLeave recordLeavePass = new RecordLeave();
+        recordLeavePass.setId(id);
+        recordLeavePass.setIsPass("2");
+        recordLeaveMapper.updateRecordLeave(recordLeavePass);
+        return recordLeave;
+    }
+
+    /**
+     * 查询请假记录信息列表
+     *
+     * @param recordLeave 请假记录信息
+     * @return 请假记录信息
+     */
+    @Override
+    public List<RecordLeave> selectRecordLeaveList(RecordLeave recordLeave)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        StringBuilder classId = new StringBuilder("0,");
+        Map<String, Object> params = recordLeave.getParams();
+        String role = "admin";
+        if (params != null && params.size() > 0) {
+            role = (String) params.get("role");
+        }
+        List<RecordLeave> recordLeaveList = new ArrayList<>();
+        if ("teacher".equals(role)) {
+            FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+            formalTeacherClass.setTeacherId(user.getUserId());
+            List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+            if (formalTeacherClasses != null && formalTeacherClasses.size() > 0) {
+                for (FormalTeacherClass teacherClass : formalTeacherClasses) {
+                    classId.append(teacherClass.getClassId()).append(",");
+                }
+            }
+            if (StringUtils.isNotBlank(classId.toString())) {
+                classId = new StringBuilder(classId.substring(0, classId.length() - 1));
+            }
+            startPage();
+            recordLeave.setClassId(classId.toString());
+            recordLeaveList = recordLeaveMapper.selectRecordLeaveList(recordLeave);
+        } else if ("parents".equals(role)) {
+            FormalParentsStudent formalParentsStudent = new FormalParentsStudent();
+            formalParentsStudent.setParentsId(user.getUserId());
+            List<FormalParentsStudent> formalParentsStudents = formalParentsStudentMapper.selectFormalParentsStudentList(formalParentsStudent);
+            for (FormalParentsStudent parentsStudent : formalParentsStudents) {
+                classId.append(parentsStudent.getClassId()).append(",");
+            }
+            if (StringUtils.isNotBlank(classId.toString())) {
+                classId = new StringBuilder(classId.substring(0, classId.length() - 1));
+            }
+            startPage();
+            recordLeave.setClassId(classId.toString());
+            recordLeaveList = recordLeaveMapper.selectRecordLeaveList(recordLeave);
+        } else if ("admin".equals(role)) {
+            startPage();
+            recordLeaveList = recordLeaveMapper.selectRecordLeaveList(recordLeave);
+        }
+
+        return recordLeaveList;
+    }
+
+    /**
+     * app请假记录数量通知
+     * @param recordLeave
+     * @return
+     */
+    @Override
+    public AjaxResult selectRecordLeaveNum(RecordLeave recordLeave) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        StringBuilder classId = new StringBuilder("0,");
+        FormalTeacherClass formalTeacherClass = new FormalTeacherClass();
+        formalTeacherClass.setTeacherId(user.getUserId());
+        List<FormalTeacherClass> formalTeacherClasses = formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+        if (formalTeacherClasses != null && formalTeacherClasses.size() > 0) {
+            for (FormalTeacherClass teacherClass : formalTeacherClasses) {
+                classId.append(teacherClass.getClassId()).append(",");
+            }
+        }
+        if (StringUtils.isNotBlank(classId.toString())) {
+            classId = new StringBuilder(classId.substring(0, classId.length() - 1));
+        }
+        recordLeave.setClassId(classId.toString());
+        int num =recordLeaveMapper.selectRecordLeaveNum(recordLeave);
+        return AjaxResult.success(num);
+    }
+
+    /**
+     * 新增请假记录信息
+     *
+     * @param recordLeave 请假记录信息
+     * @return 结果
+     */
+    @Override
+    public int insertRecordLeave(RecordLeave recordLeave)
+    {
+        recordLeave.setCreateTime(DateUtils.getNowDate());
+        return recordLeaveMapper.insertRecordLeave(recordLeave);
+    }
+
+    /**
+     * 修改请假记录信息
+     *
+     * @param recordLeave 请假记录信息
+     * @return 结果
+     */
+    @Override
+    public int updateRecordLeave(RecordLeave recordLeave)
+    {
+        recordLeave.setUpdateTime(DateUtils.getNowDate());
+        return recordLeaveMapper.updateRecordLeave(recordLeave);
+    }
+
+    /**
+     * 批量删除请假记录信息
+     *
+     * @param ids 需要删除的请假记录信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRecordLeaveByIds(Long[] ids)
+    {
+        return recordLeaveMapper.deleteRecordLeaveByIds(ids);
+    }
+
+    /**
+     * 删除请假记录信息信息
+     *
+     * @param id 请假记录信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteRecordLeaveById(Long id)
+    {
+        return recordLeaveMapper.deleteRecordLeaveById(id);
+    }
+}

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

@@ -0,0 +1,150 @@
+package org.dromara.system.service.impl;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.RegisterParents;
+import com.ruoyi.system.domain.RegisterParentsStudent;
+import com.ruoyi.system.mapper.RegisterParentsMapper;
+import com.ruoyi.system.mapper.RegisterParentsStudentMapper;
+import com.ruoyi.system.service.IRegisterParentsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 注册-家长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
+    @Transactional
+    public AjaxResult insertRegisterParents(RegisterParents registerParents)
+    {
+
+        //查询是否已经注册过
+        RegisterParents registerParentsOld = registerParentsMapper.selectRegisterParentsByPhonenumber(registerParents.getUserPhone());
+        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);
+    }
+}

+ 129 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/RegisterParentsStudentServiceImpl.java

@@ -0,0 +1,129 @@
+package org.dromara.system.service.impl;
+
+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.RegisterParentsStudent;
+import com.ruoyi.system.mapper.FormalTeacherClassMapper;
+import com.ruoyi.system.mapper.RegisterParentsStudentMapper;
+import com.ruoyi.system.service.IRegisterParentsStudentService;
+import com.ruoyi.system.service.IRegisterTeacherClassService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 注册-家长-学生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());
+        registerParentsStudent.setIsPass("1");
+        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);
+    }
+}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio