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 c856ef7e..9aa6c130 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java @@ -121,6 +121,6 @@ public interface StudentDao extends BaseMapper{ PageQuery> pagedListStudentInfoByClassId(PageQuery query); - List findAllBySchoolId(Long schoolId); + List> findAllBySchoolId(Long schoolId); } \ 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 82b372fa..69d4a07b 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -1632,7 +1632,17 @@ public class StudentService extends CoreBaseService { return studentDao.pagedListStudentInfoByClassId(pageQuery); } - public List findAllBySchoolId(Long schoolId) { - return studentDao.findAllBySchoolId(schoolId); + public List> findAllBySchoolId(Long schoolId) { + List> mapList = studentDao.findAllBySchoolId(schoolId); + List> dataList = new ArrayList<>(); + //将内部元素弄成驼峰 + for (Map map : mapList) { + Map data= new HashMap<>(); + data.put("studentNo",map.get("studentno")); + data.put("name",map.get("name")); + data.put("classId",map.get("classid")); + dataList.add(data); + } + return dataList; } } \ 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 c4ac3c0f..0df89d69 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java @@ -889,7 +889,7 @@ public class AccountController { @ApiOperation("根据学校id获取学生信息") @GetMapping("findAllStudentBySchoolId.json") - public JsonResult> findAllStudentBySchoolId(Long schoolId) { + public JsonResult>> findAllStudentBySchoolId(Long schoolId) { return JsonResult.success(studentService.findAllBySchoolId(schoolId)); } diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index d39a26bd..9ec05911 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -2214,4 +2214,4 @@ pagedListStudentInfoByClassId findAllBySchoolId === -select * from student join universities_colleges uc on student.org_id = uc.org_id where old_school_id = #schoolId# \ No newline at end of file +select student.student_sn as studentNo,student.student_name as name,school_class.old_class_id as classId from student join universities_colleges uc on student.org_id = uc.org_id join school_class on student.class_id =school_class.class_id where old_school_id = #schoolId# \ No newline at end of file