lts
/
auto_score
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决了一些冲突

This commit is contained in:
zlm133588 2025-03-12 22:07:52 +08:00
parent dcb98abc28
commit a9d9366f06
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AES-front/src/api/admin.js
View File

@ -35,9 +35,6 @@ export default {
findAllShoolsInAdminusers: () => request.post('/school/findAllShoolsInAdminusers'), findAllShoolsInAdminusers: () => request.post('/school/findAllShoolsInAdminusers'),
deleteClass: (data) => request.post('/classes/deleteClass', data), deleteClass: (data) => request.post('/classes/deleteClass', data),
addClass: (data) => request.post('/classes/addClass', 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), findAllCoursesPage: (data) => request.post('/course/findAllCoursesPage', data),
Addcourse: (data) => request.post('/course/addCourse', data), Addcourse: (data) => request.post('/course/addCourse', data),
getCourseById: (data) => request.post('/course/findCourseById', data), getCourseById: (data) => request.post('/course/findCourseById', data),

5
AES-front/src/views/admin/class/class-add.vue
View File

@ -87,8 +87,9 @@ const queryByPage = async () => {
loading.value = true; loading.value = true;
path.value=router.currentRoute.value.fullPath path.value=router.currentRoute.value.fullPath
if (role[0]==='admin'){ if (role[0]==='admin'){
const schoolId=userStore.getSchoolId() // const schoolId=userStore.getSchoolId()
const res1 = await api.findAllAdminusersBySchoolId({schoolId:schoolId}) const res1 = await
api.findAllTeacher({})
const lis=res1.data const lis=res1.data
const transformedData=lis.map(item => { const transformedData=lis.map(item => {
if(item.role==='admin'){ if(item.role==='admin'){

2
AES/src/main/java/com/example/aes/user/dao/ClassesDaoI.java
View File

@ -43,4 +43,6 @@ public interface ClassesDaoI extends BaseDaoI<Classes> {
public long findClassNotInCourseNum(UClass uClass); public long findClassNotInCourseNum(UClass uClass);
public long findClassNotInCourseNum(int courseId, int teacherId, boolean history); public long findClassNotInCourseNum(int courseId, int teacherId, boolean history);
public List<Classes> findAllClass(); // 查询所有班级
public void addClass(PMClasses pclass); // 添加班级
} }

24
AES/src/main/java/com/example/aes/user/dao/impl/ClassesDaoImpl.java
View File

@ -464,5 +464,29 @@ public class ClassesDaoImpl extends BaseDaoImpl<Classes> implements ClassesDaoI
return pmclassesList.size(); 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<Classes> findAllClass() {
// TODO Auto-generated method stub
String hql = "from Classes";
return this.find(hql);
}
} }