diff --git a/AES-front/src/api/admin.js b/AES-front/src/api/admin.js index 861e155..e9d4817 100644 --- a/AES-front/src/api/admin.js +++ b/AES-front/src/api/admin.js @@ -35,9 +35,6 @@ export default { findAllShoolsInAdminusers: () => request.post('/school/findAllShoolsInAdminusers'), deleteClass: (data) => request.post('/classes/deleteClass', data), addClass: (data) => request.post('/classes/addClass', data), - findAllClassPage: (data) => request.post('/classes/findAllClassPage', data), - findAllShoolsInAdminusers: () => request.post('/school/findAllShoolsInAdminusers'), - deleteClass: (data) => request.post('/classes/deleteClass', data), findAllCoursesPage: (data) => request.post('/course/findAllCoursesPage', data), Addcourse: (data) => request.post('/course/addCourse', data), getCourseById: (data) => request.post('/course/findCourseById', data), diff --git a/AES-front/src/views/admin/class/class-add.vue b/AES-front/src/views/admin/class/class-add.vue index 9857f3e..9a9b72b 100644 --- a/AES-front/src/views/admin/class/class-add.vue +++ b/AES-front/src/views/admin/class/class-add.vue @@ -87,8 +87,9 @@ const queryByPage = async () => { loading.value = true; path.value=router.currentRoute.value.fullPath if (role[0]==='admin'){ - const schoolId=userStore.getSchoolId() - const res1 = await api.findAllAdminusersBySchoolId({schoolId:schoolId}) + // const schoolId=userStore.getSchoolId() + const res1 = await + api.findAllTeacher({}) const lis=res1.data const transformedData=lis.map(item => { if(item.role==='admin'){ diff --git a/AES/src/main/java/com/example/aes/user/dao/ClassesDaoI.java b/AES/src/main/java/com/example/aes/user/dao/ClassesDaoI.java index d2f36ee..9b6e4ea 100644 --- a/AES/src/main/java/com/example/aes/user/dao/ClassesDaoI.java +++ b/AES/src/main/java/com/example/aes/user/dao/ClassesDaoI.java @@ -43,4 +43,6 @@ public interface ClassesDaoI extends BaseDaoI { public long findClassNotInCourseNum(UClass uClass); public long findClassNotInCourseNum(int courseId, int teacherId, boolean history); + public List findAllClass(); // 查询所有班级 + public void addClass(PMClasses pclass); // 添加班级 } diff --git a/AES/src/main/java/com/example/aes/user/dao/impl/ClassesDaoImpl.java b/AES/src/main/java/com/example/aes/user/dao/impl/ClassesDaoImpl.java index fff7a52..778cc76 100644 --- a/AES/src/main/java/com/example/aes/user/dao/impl/ClassesDaoImpl.java +++ b/AES/src/main/java/com/example/aes/user/dao/impl/ClassesDaoImpl.java @@ -464,5 +464,29 @@ public class ClassesDaoImpl extends BaseDaoImpl implements ClassesDaoI return pmclassesList.size(); } + @Override + public void addClass(PMClasses pclass) { + // TODO Auto-generated method stub + Classes c = new Classes(); + c.setName(pclass.getName()); + c.setTeacherId(pclass.getTeacherId()); +// c.setWeektime(pclass.getWeektime()); +// c.setAdvance(pclass.getAdvance()); +// c.setLate(pclass.getLate()); +// c.setReject(pclass.getReject()); +// c.setFirst_week_monday(pclass.getFirst_week_monday()); + Calendar cal = Calendar.getInstance(); + Date createTime = cal.getTime(); + c.setCreateTime(createTime); + c.setStudentNum(0); + c.setInviteCode(pclass.getInviteCode()); + this.save(c); + } + @Override + public List findAllClass() { + // TODO Auto-generated method stub + String hql = "from Classes"; + return this.find(hql); + } }