From 92efa5694dd7b1e163832c03dae44c22dd8bf380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Wed, 13 Dec 2023 20:42:30 +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
---
.../main/java/com/ibeetl/jlw/dao/StudentDao.java | 2 ++
.../com/ibeetl/jlw/service/SchoolClassService.java | 2 +-
.../java/com/ibeetl/jlw/service/StudentService.java | 4 ++++
.../java/com/ibeetl/jlw/web/AccountController.java | 13 +++++++++++++
.../com/ibeetl/jlw/web/query/SchoolClassQuery.java | 12 ++++++------
web/src/main/resources/sql/jlw/schoolClass.md | 4 ++--
web/src/main/resources/sql/jlw/student.md | 7 ++++++-
7 files changed, 34 insertions(+), 10 deletions(-)
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 5eac4238..6d26a553 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java
@@ -129,4 +129,6 @@ public interface StudentDao extends BaseMapper<Student>{
List<Student> getNoBaseStudent();
+
+ List<String> findStudentNoByClassId(Long classId);
}
\ 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 12be4051..fd0c51fd 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java
@@ -169,7 +169,7 @@ public class SchoolClassService extends CoreBaseService<SchoolClass> {
public SchoolClass getByOldId(Long oldClassId){
SchoolClassQuery query = new SchoolClassQuery();
- query.setOldId(oldClassId);
+ query.setOldClassId(oldClassId);
return getFirst(getValuesByQueryNotWithPermission(query));
}
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 e39c7874..ed0d881f 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java
@@ -1658,6 +1658,10 @@ public class StudentService extends CoreBaseService<Student> {
return dataList;
}
+ public List<String> findStudentNoByClassId(Long classId) {
+ return studentDao.findStudentNoByClassId(classId);
+ }
+
public List<Student> getAll(){
return studentDao.all();
}
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 d5dc2bde..3e7ee62e 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java
@@ -1035,4 +1035,17 @@ public class AccountController {
}
return JsonResult.success();
}
+
+ @ApiOperation("智云2.0接口:GetStudentNoByClassId")
+ @GetMapping("getStudentNoByClassId")
+ public JsonResult getStudentNoByClassId(Integer classId) {
+ if (classId != null) {
+ SchoolClass schoolClass = schoolClassService.getByOldId(Long.valueOf(classId));
+ if (schoolClass != null) {
+ List<String> studentNos = studentService.findStudentNoByClassId(schoolClass.getClassId());
+ return JsonResult.success(studentNos);
+ }
+ }
+ return JsonResult.success();
+ }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java
index 02c7d064..b1d73e33 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java
@@ -48,14 +48,14 @@ public class SchoolClassQuery extends PageParam {
@Query(name = "教师ID", display = false)
private Long teacherId;
- private Long oldId;
+ private Long oldClassId;
- public Long getOldId() {
- return oldId;
+ public Long getOldClassId() {
+ return oldClassId;
}
- public void setOldId(Long oldId) {
- this.oldId = oldId;
+ public void setOldClassId(Long oldClassId) {
+ this.oldClassId = oldClassId;
}
public Long getClassId(){
@@ -143,7 +143,7 @@ public class SchoolClassQuery extends PageParam {
pojo.setAddTime(this.getAddTime());
pojo.setOrgId(this.getOrgId());
pojo.setUserId(this.getUserId());
- pojo.setOldClassId(this.getOldId());
+ pojo.setOldClassId(this.getOldClassId());
return pojo;
}
diff --git a/web/src/main/resources/sql/jlw/schoolClass.md b/web/src/main/resources/sql/jlw/schoolClass.md
index 547c5653..de2b41b3 100644
--- a/web/src/main/resources/sql/jlw/schoolClass.md
+++ b/web/src/main/resources/sql/jlw/schoolClass.md
@@ -172,8 +172,8 @@ getValuesByQueryNotWithPermission
@if(!isEmpty(userId)){
and t.user_id =#userId#
@}
- @if(!isEmpty(oldId)){
- and t.old_class_id =#oldId#
+ @if(!isEmpty(oldClassId)){
+ and t.old_class_id =#oldClassId#
@}
getAllSchoolClass
diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md
index 90966055..3ead1101 100644
--- a/web/src/main/resources/sql/jlw/student.md
+++ b/web/src/main/resources/sql/jlw/student.md
@@ -2231,4 +2231,9 @@ select *
from student
where student_id not in (select student_account_asset_allocation.student_id
from student_account_asset_allocation
-group by student_account_asset_allocation.student_id)
\ No newline at end of file
+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