From 09b2d0317bae18c167613c9f96bcbe5d0708ee27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Sun, 24 Dec 2023 19:41:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81swagger=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ibeetl/jlw/dao/SchoolClassDao.java | 2 ++ .../java/com/ibeetl/jlw/dao/StudentDao.java | 2 ++ .../jlw/service/SchoolClassService.java | 4 ++++ .../ibeetl/jlw/service/StudentService.java | 4 ++++ .../com/ibeetl/jlw/web/AccountController.java | 15 ++++++++++++++ web/src/main/resources/sql/jlw/schoolClass.md | 20 ++++++++++++++++++- web/src/main/resources/sql/jlw/student.md | 6 +++++- 7 files changed, 51 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java index 1918b4b8..601317c0 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/SchoolClassDao.java @@ -46,4 +46,6 @@ public interface SchoolClassDao extends BaseMapper { List> getClassIdsByZhiyun(Long userId); List> findAllClass(); + + List> getClassIdsByZhiyunAndUserIdIsNull(); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java index 6d26a553..ad425b59 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java @@ -131,4 +131,6 @@ public interface StudentDao extends BaseMapper{ List getNoBaseStudent(); List findStudentNoByClassId(Long classId); + + List> findAllStudent(); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java index b63398e0..814835f9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java @@ -310,4 +310,8 @@ public class SchoolClassService extends CoreBaseService { return schoolClassDao.findAllClass(); } + + public List> getClassIdsByZhiyunAndUserIdIsNull(){ + return schoolClassDao.getClassIdsByZhiyunAndUserIdIsNull(); + } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java index ed0d881f..2ac685c7 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -1670,4 +1670,8 @@ public class StudentService extends CoreBaseService { public List getNoBaseStudent(){ return studentDao.getNoBaseStudent(); } + + public List> findAllStudent(){ + return studentDao.findAllStudent(); + } } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java index 5f8d1f67..66f7060f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java @@ -1091,6 +1091,9 @@ public class AccountController { @ApiOperation("理财接口：获取教师授课班级列表") @GetMapping("getClassIdsByZhiyun.json") public JsonResult getClassIdsByZhiyun(Long userId) { + if(userId==null){ + return JsonResult.success(schoolClassService.getClassIdsByZhiyunAndUserIdIsNull()); + } return JsonResult.success(schoolClassService.getClassIdsByZhiyun(userId)); } @@ -1099,4 +1102,16 @@ public class AccountController { public JsonResult findAllClass() { return JsonResult.success(schoolClassService.findAllClass()); } + + @ApiOperation("理财接口：获取所有用户") + @GetMapping("findAllUser.json") + public JsonResult findAllUser() { + return JsonResult.success(coreUserService.findAllUser()); + } + + @ApiOperation("理财接口：获取所有学生信息") + @GetMapping("findAllStudent.json") + public JsonResult findAllStudent() { + return JsonResult.success(studentService.findAllStudent()); + } } diff --git a/web/src/main/resources/sql/jlw/schoolClass.md b/web/src/main/resources/sql/jlw/schoolClass.md index 6671a327..a4aca2ee 100644 --- a/web/src/main/resources/sql/jlw/schoolClass.md +++ b/web/src/main/resources/sql/jlw/schoolClass.md @@ -226,4 +226,22 @@ teacher.teacher_id; findAllClass === -select class_id as id,class_name as name from school_class where class_status = 1 \ No newline at end of file +select class_id as id,class_name as name from school_class where class_status = 1 + + +getClassIdsByZhiyunAndUserIdIsNull +=== +SELECT +teacher.teacher_id as userId, +GROUP_CONCAT(DISTINCT school_class.class_id ORDER BY school_class.class_id SEPARATOR ',') AS class_ids, +3 as roleId +FROM +universities_colleges +JOIN +school_class ON universities_colleges.universities_colleges_id = school_class.universities_colleges_id +JOIN +teacher ON teacher.universities_colleges_id = universities_colleges.universities_colleges_id +GROUP BY +teacher.teacher_id, universities_colleges.universities_colleges_id, universities_colleges.universities_colleges_name +ORDER BY +teacher.teacher_id; \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index 3ead1101..545f9771 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -2236,4 +2236,8 @@ group by student_account_asset_allocation.student_id) findStudentNoByClassId === -select student_sn as studentNo from student where class_id =#classId# \ No newline at end of file +select student_sn as studentNo from student where class_id =#classId# + +findAllStudent +=== +select student_id as id,student_name as name,student_sn as schoolNumber,4 as roleId,class_id as classId from student \ No newline at end of file