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
39e9066f
Commit
39e9066f
authored
Sep 16, 2026
by
王蔡翾
Browse files
签到码优化
parent
ab3ad96d
Changes
4
Hide whitespace changes
Inline
Side-by-side
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/ClassSubjectVO.java
View file @
39e9066f
package
com.platform.business.model.vo
;
package
com.platform.business.model.vo
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
com.platform.business.model.entity.ClassSubjectEntity
;
import
com.platform.business.model.entity.ClassSubjectEntity
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.List
;
...
@@ -21,6 +22,16 @@ public class ClassSubjectVO extends ClassSubjectEntity {
...
@@ -21,6 +22,16 @@ public class ClassSubjectVO extends ClassSubjectEntity {
private
String
status
;
private
String
status
;
/**
* 当前课次正在使用的六位签到码。
*
* <p>该字段只由教师课程查询关联活动签到会话后写入。课程尚未开始上课、签到会话已经结束,
* 或当前课次从未创建签到会话时均返回 {@code null},避免继续暴露已经失效的签到码。</p>
*/
@ApiModelProperty
(
"活动签到会话的六位签到码;未开始或已停止签到时为空"
)
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
private
String
verificationCode
;
/**
/**
* 当前课程班级的有效学员数。
* 当前课程班级的有效学员数。
*
*
...
...
practical-business/src/main/resources/com/platform/business/mapper/ClassSubjectMapper.xml
View file @
39e9066f
...
@@ -197,6 +197,7 @@
...
@@ -197,6 +197,7 @@
cs.location,
cs.location,
cs.type,
cs.type,
c.name as className,
c.name as className,
attendance_session.verification_code as verificationCode,
count(distinct member.user_id) as studentCount,
count(distinct member.user_id) as studentCount,
count(attendance.id) as attendanceRecordCount,
count(attendance.id) as attendanceRecordCount,
sum(case when attendance.status = 'NORMAL' then 1 else 0 end) as normalCount,
sum(case when attendance.status = 'NORMAL' then 1 else 0 end) as normalCount,
...
@@ -214,6 +215,16 @@
...
@@ -214,6 +215,16 @@
class c
class c
on
on
cs.class_id = c.id
cs.class_id = c.id
<!--
只有教师点击开始上课后才存在ACTIVE会话;在JOIN条件中限制状态,确保已经结束的签到码
不会因为历史会话仍保留在数据库中而重新出现在教师课程列表。
-->
left join
class_subject_attendance_session attendance_session
on
attendance_session.subject_id = cs.id
and
attendance_session.status = 'ACTIVE'
left join
left join
class_student member
class_student member
on
on
...
@@ -235,7 +246,7 @@
...
@@ -235,7 +246,7 @@
group by
group by
cs.id, cs.class_id, cs.subject_times, cs.date, cs.week, cs.time_frame,
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, cs.location,
cs.subject_hour, cs.subject_name, cs.teacher_id, cs.remark, cs.location,
cs.type, c.name
cs.type, c.name
, attendance_session.verification_code
order by
order by
cs.date asc, cs.time_frame asc, cs.id asc
cs.date asc, cs.time_frame asc, cs.id asc
</select>
</select>
...
@@ -254,6 +265,7 @@
...
@@ -254,6 +265,7 @@
cs.location,
cs.location,
cs.type,
cs.type,
c.name as className,
c.name as className,
attendance_session.verification_code as verificationCode,
count(distinct member.user_id) as studentCount,
count(distinct member.user_id) as studentCount,
count(attendance.id) as attendanceRecordCount,
count(attendance.id) as attendanceRecordCount,
sum(case when attendance.status = 'NORMAL' then 1 else 0 end) as normalCount,
sum(case when attendance.status = 'NORMAL' then 1 else 0 end) as normalCount,
...
@@ -271,6 +283,13 @@
...
@@ -271,6 +283,13 @@
class c
class c
on
on
cs.class_id = c.id
cs.class_id = c.id
<!-- 教师按日详情与月历使用相同的活动会话规则,避免同一课程在两个入口显示不同。 -->
left join
class_subject_attendance_session attendance_session
on
attendance_session.subject_id = cs.id
and
attendance_session.status = 'ACTIVE'
left join
left join
class_student member
class_student member
on
on
...
@@ -288,7 +307,7 @@
...
@@ -288,7 +307,7 @@
group by
group by
cs.id, cs.class_id, cs.subject_times, cs.date, cs.week, cs.time_frame,
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, cs.location,
cs.subject_hour, cs.subject_name, cs.teacher_id, cs.remark, cs.location,
cs.type, c.name
cs.type, c.name
, attendance_session.verification_code
order by
order by
cs.time_frame asc, cs.id asc
cs.time_frame asc, cs.id asc
</select>
</select>
...
...
practical-business/src/main/resources/teacher-course-api.md
View file @
39e9066f
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
-
`studentCount`
:班级当前学员数;
-
`studentCount`
:班级当前学员数;
-
`status`
:
`UPCOMING`
未开始、
`PENDING`
待完成点名、
`DONE`
已完成点名;
-
`status`
:
`UPCOMING`
未开始、
`PENDING`
待完成点名、
`DONE`
已完成点名;
-
`verificationCode`
:教师已经开始上课且签到会话仍为
`ACTIVE`
时返回六位签到码,否则不返回该字段;
-
`attendance`
:应到、正常、迟到、缺勤、请假和出勤率。
-
`attendance`
:应到、正常、迟到、缺勤、请假和出勤率。
课程结束后查询页面会幂等补写尚无记录的学员为
`ABSENT`
,随后再计算状态。
课程结束后查询页面会幂等补写尚无记录的学员为
`ABSENT`
,随后再计算状态。
...
...
practical-business/src/test/java/com/platform/business/mapper/TeacherCourseMapperXmlTest.java
View file @
39e9066f
...
@@ -35,8 +35,27 @@ class TeacherCourseMapperXmlTest {
...
@@ -35,8 +35,27 @@ class TeacherCourseMapperXmlTest {
assertTrue
(
detailSql
.
contains
(
"from class_subject cs"
));
assertTrue
(
detailSql
.
contains
(
"from class_subject cs"
));
assertTrue
(
detailSql
.
contains
(
"cs.teacher_id = ?"
));
assertTrue
(
detailSql
.
contains
(
"cs.teacher_id = ?"
));
assertTrue
(
detailSql
.
contains
(
"count(distinct member.user_id) as studentCount"
));
assertTrue
(
detailSql
.
contains
(
"count(distinct member.user_id) as studentCount"
));
assertTrue
(
detailSql
.
contains
(
"attendance_session.verification_code as verificationCode"
));
assertTrue
(
detailSql
.
contains
(
"left join class_subject_attendance_session attendance_session"
));
assertTrue
(
detailSql
.
contains
(
"attendance_session.status = 'ACTIVE'"
));
assertFalse
(
detailSql
.
contains
(
"from class_subject c left join class c"
));
assertFalse
(
detailSql
.
contains
(
"from class_subject c left join class c"
));
Map
<
String
,
Object
>
scheduleParameters
=
new
HashMap
<>();
scheduleParameters
.
put
(
"userId"
,
"teacher-1"
);
scheduleParameters
.
put
(
"startDate"
,
new
Date
());
scheduleParameters
.
put
(
"endDate"
,
new
Date
());
String
scheduleSql
=
compact
(
configuration
.
getMappedStatement
(
"com.platform.business.mapper.ClassSubjectMapper.queryTeacherCourse"
)
.
getBoundSql
(
scheduleParameters
).
getSql
());
// 月历接口必须只返回ACTIVE会话中的签到码,历史或已结束会话不能被重新暴露。
assertTrue
(
scheduleSql
.
contains
(
"attendance_session.verification_code as verificationCode"
));
assertTrue
(
scheduleSql
.
contains
(
"left join class_subject_attendance_session attendance_session"
));
assertTrue
(
scheduleSql
.
contains
(
"attendance_session.status = 'ACTIVE'"
));
BoundSql
upsert
=
configuration
.
getMappedStatement
(
BoundSql
upsert
=
configuration
.
getMappedStatement
(
"com.platform.business.mapper.ClassSubjectAttendanceMapper.upsertTeacherStatus"
)
"com.platform.business.mapper.ClassSubjectAttendanceMapper.upsertTeacherStatus"
)
.
getBoundSql
(
new
Object
());
.
getBoundSql
(
new
Object
());
...
...
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