Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
practical_train
Commits
e7d4a11d
Commit
e7d4a11d
authored
Aug 03, 2026
by
wujipeng
Browse files
优化
parent
dd4cc268
Changes
7
Hide whitespace changes
Inline
Side-by-side
practical-business/src/main/java/com/platform/business/controller/ClassController.java
View file @
e7d4a11d
...
@@ -3,6 +3,7 @@ package com.platform.business.controller;
...
@@ -3,6 +3,7 @@ package com.platform.business.controller;
import
com.platform.business.model.dto.CalendarDTO
;
import
com.platform.business.model.dto.CalendarDTO
;
import
com.platform.business.model.dto.ClassDTO
;
import
com.platform.business.model.dto.ClassDTO
;
import
com.platform.business.model.vo.CalendarVO
;
import
com.platform.business.model.vo.CalendarVO
;
import
com.platform.business.model.vo.ClassVO
;
import
com.platform.business.service.ClassService
;
import
com.platform.business.service.ClassService
;
import
com.platform.controller.BaseController
;
import
com.platform.controller.BaseController
;
import
com.platform.model.resp.Result
;
import
com.platform.model.resp.Result
;
...
@@ -44,13 +45,13 @@ public class ClassController extends BaseController {
...
@@ -44,13 +45,13 @@ public class ClassController extends BaseController {
@ApiOperation
(
"课程安排表"
)
@ApiOperation
(
"课程安排表"
)
@PostMapping
(
"/schedule"
)
@PostMapping
(
"/schedule"
)
public
Result
schedule
(
@RequestBody
ClassDTO
classDTO
)
{
public
Result
<
List
<
ClassVO
>>
schedule
(
@RequestBody
ClassDTO
classDTO
)
{
return
Result
.
data
(
classService
.
schedule
(
classDTO
));
return
Result
.
data
(
classService
.
schedule
(
classDTO
));
}
}
@ApiOperation
(
"课程安排表-教师端"
)
@ApiOperation
(
"课程安排表-教师端"
)
@PostMapping
(
"/schedule/teacher"
)
@PostMapping
(
"/schedule/teacher"
)
public
Result
scheduleTeacher
(
@RequestBody
ClassDTO
classDTO
)
{
public
Result
<
List
<
ClassVO
>>
scheduleTeacher
(
@RequestBody
ClassDTO
classDTO
)
{
return
Result
.
data
(
classService
.
scheduleTeacher
(
classDTO
));
return
Result
.
data
(
classService
.
scheduleTeacher
(
classDTO
));
}
}
...
...
practical-business/src/main/java/com/platform/business/mapper/ClassSubjectMapper.java
View file @
e7d4a11d
...
@@ -19,10 +19,11 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> {
...
@@ -19,10 +19,11 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> {
List
<
ClassSubjectVO
>
countByTeacherId
(
String
id
);
List
<
ClassSubjectVO
>
countByTeacherId
(
String
id
);
List
<
ClassSubjectVO
>
queryOneself
(
String
userId
);
List
<
ClassSubjectVO
>
queryOneself
(
@Param
(
"classIds"
)
List
<
Integer
>
classIds
);
List
<
ClassSubjectVO
>
queryOneselfTeacher
(
@Param
(
"userId"
)
String
userId
);
List
<
ClassSubjectVO
>
queryByTeacherId
(
String
id
);
List
<
ClassSubjectVO
>
queryByTeacherId
(
String
id
);
List
<
CalendarVO
>
todayCourse
(
@Param
(
"classIds"
)
List
<
Integer
>
classIds
);
List
<
CalendarVO
>
todayCourse
(
@Param
(
"classIds"
)
List
<
Integer
>
classIds
);
}
}
practical-business/src/main/java/com/platform/business/service/ClassService.java
View file @
e7d4a11d
...
@@ -18,9 +18,9 @@ public interface ClassService extends IService<ClassEntity> {
...
@@ -18,9 +18,9 @@ public interface ClassService extends IService<ClassEntity> {
boolean
deleteStu
(
String
studentId
);
boolean
deleteStu
(
String
studentId
);
Object
schedule
(
ClassDTO
classDTO
);
List
<
ClassVO
>
schedule
(
ClassDTO
classDTO
);
Object
scheduleTeacher
(
ClassDTO
classDTO
);
List
<
ClassVO
>
scheduleTeacher
(
ClassDTO
classDTO
);
List
<
CalendarVO
>
todayCourse
(
String
userId
);
List
<
CalendarVO
>
todayCourse
(
String
userId
);
...
...
practical-business/src/main/java/com/platform/business/service/ClassSubjectService.java
View file @
e7d4a11d
...
@@ -26,8 +26,11 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> {
...
@@ -26,8 +26,11 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> {
SysTeacherCountVO
queryByTeacherUserName
(
String
userName
);
SysTeacherCountVO
queryByTeacherUserName
(
String
userName
);
List
<
ClassSubjectVO
>
queryOneself
(
String
userId
);
List
<
ClassSubjectVO
>
queryOneself
(
List
<
Integer
>
classIds
);
List
<
ClassSubjectVO
>
queryOneselfTeacher
(
String
userId
);
List
<
CalendarVO
>
todayCourse
(
List
<
Integer
>
classIds
);
List
<
CalendarVO
>
todayCourse
(
List
<
Integer
>
classIds
);
}
}
practical-business/src/main/java/com/platform/business/service/impl/ClassServiceImpl.java
View file @
e7d4a11d
...
@@ -82,10 +82,13 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
...
@@ -82,10 +82,13 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
}
}
@Override
@Override
public
Object
schedule
(
ClassDTO
classDTO
)
{
public
List
<
ClassVO
>
schedule
(
ClassDTO
classDTO
)
{
//查询考试信息
//查询考试信息
List
<
ExamStudentVO
>
examStudentList
=
examStudentService
.
queryOneself
(
classDTO
.
getUserId
());
List
<
ExamStudentVO
>
examStudentList
=
examStudentService
.
queryOneself
(
classDTO
.
getUserId
());
List
<
ClassSubjectVO
>
classSubjectList
=
classSubjectService
.
queryOneself
(
classDTO
.
getUserId
());
//获取班级id
List
<
Integer
>
classIds
=
classStudentService
.
queryClassIdByUserId
(
classDTO
.
getUserId
());
//查询课程信息
List
<
ClassSubjectVO
>
classSubjectList
=
classSubjectService
.
queryOneself
(
classIds
);
List
<
ClassVO
>
result
=
Lists
.
newArrayList
();
List
<
ClassVO
>
result
=
Lists
.
newArrayList
();
List
<
Date
>
dateList
=
getDatesBetweenTwoDate
(
classDTO
.
getStartDate
(),
classDTO
.
getEndDate
());
List
<
Date
>
dateList
=
getDatesBetweenTwoDate
(
classDTO
.
getStartDate
(),
classDTO
.
getEndDate
());
for
(
Date
date
:
dateList
)
{
for
(
Date
date
:
dateList
)
{
...
@@ -111,11 +114,11 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
...
@@ -111,11 +114,11 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
}
}
@Override
@Override
public
Object
scheduleTeacher
(
ClassDTO
classDTO
)
{
public
List
<
ClassVO
>
scheduleTeacher
(
ClassDTO
classDTO
)
{
//查询考试信息
//查询考试信息
List
<
ExamStudentVO
>
examStudentList
=
examStudentService
.
queryOneselfTeacher
(
classDTO
.
getUserId
());
List
<
ExamStudentVO
>
examStudentList
=
examStudentService
.
queryOneselfTeacher
(
classDTO
.
getUserId
());
//
TODO 加上权限
//
查询课程信息
List
<
ClassSubjectVO
>
classSubjectList
=
classSubjectService
.
queryOneself
(
classDTO
.
getUserId
());
List
<
ClassSubjectVO
>
classSubjectList
=
classSubjectService
.
queryOneself
Teacher
(
classDTO
.
getUserId
());
List
<
ClassVO
>
result
=
Lists
.
newArrayList
();
List
<
ClassVO
>
result
=
Lists
.
newArrayList
();
List
<
Date
>
dateList
=
getDatesBetweenTwoDate
(
classDTO
.
getStartDate
(),
classDTO
.
getEndDate
());
List
<
Date
>
dateList
=
getDatesBetweenTwoDate
(
classDTO
.
getStartDate
(),
classDTO
.
getEndDate
());
for
(
Date
date
:
dateList
)
{
for
(
Date
date
:
dateList
)
{
...
...
practical-business/src/main/java/com/platform/business/service/impl/ClassSubjectServiceImpl.java
View file @
e7d4a11d
...
@@ -208,8 +208,13 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla
...
@@ -208,8 +208,13 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla
}
}
@Override
@Override
public
List
<
ClassSubjectVO
>
queryOneself
(
String
userId
)
{
public
List
<
ClassSubjectVO
>
queryOneself
(
List
<
Integer
>
classIds
)
{
return
baseMapper
.
queryOneself
(
userId
);
return
baseMapper
.
queryOneself
(
classIds
);
}
@Override
public
List
<
ClassSubjectVO
>
queryOneselfTeacher
(
String
userId
)
{
return
baseMapper
.
queryOneselfTeacher
(
userId
);
}
}
@Override
@Override
...
...
practical-business/src/main/resources/com/platform/business/mapper/ClassSubjectMapper.xml
View file @
e7d4a11d
...
@@ -64,21 +64,50 @@
...
@@ -64,21 +64,50 @@
</select>
</select>
<select
id=
"queryOneself"
resultType=
"com.platform.business.model.vo.ClassSubjectVO"
>
<select
id=
"queryOneself"
resultType=
"com.platform.business.model.vo.ClassSubjectVO"
>
select
select
c
lass_subject
.id,
c
s
.id,
c
lass_subject
.class_id,
c
s
.class_id,
c
lass_subject
.subject_times,
c
s
.subject_times,
c
lass_subject
.date,
c
s
.date,
c
lass_subject
.week,
c
s
.week,
c
lass_subject
.time_frame,
c
s
.time_frame,
c
lass_subject
.subject_hour,
c
s
.subject_hour,
c
lass_subject
.subject_name,
c
s
.subject_name,
c
lass_subject
.teacher_id,
c
s
.teacher_id,
c
lass_subject
.remark,
c
s
.remark,
c
lass
.name as className
c.name as className
from
from
class_subject
class_subject cs
left join class
left join
on class_subject.class_id = class.id
class c
on
cs.class_id = c.id
where
cs.class_id in
<foreach
item=
"item"
index=
"index"
collection=
"classIds"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</select>
<select
id=
"queryOneselfTeacher"
resultType=
"com.platform.business.model.vo.ClassSubjectVO"
>
select
cs.id,
cs.class_id,
cs.subject_times,
cs.date,
cs.week,
cs.time_frame,
cs.subject_hour,
cs.subject_name,
cs.teacher_id,
cs.remark,
c.name as className
from
class_subject cs
left join
class c
on
cs.class_id = c.id
where
cs.teacher_id = #{userId}
</select>
</select>
<select
id=
"todayCourse"
resultType=
"com.platform.business.model.vo.CalendarVO"
>
<select
id=
"todayCourse"
resultType=
"com.platform.business.model.vo.CalendarVO"
>
select
select
...
@@ -101,4 +130,5 @@
...
@@ -101,4 +130,5 @@
#{item}
#{item}
</foreach>
</foreach>
</select>
</select>
</mapper>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment