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
98b2beaf
Commit
98b2beaf
authored
Sep 03, 2026
by
wujipeng
Browse files
教师-教案管理优化
parent
bed7d30d
Changes
20
Expand all
Hide whitespace changes
Inline
Side-by-side
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/TeachingPlanAdminQueryDTO.java
View file @
98b2beaf
...
...
@@ -16,4 +16,7 @@ public class TeachingPlanAdminQueryDTO extends TeachingPlanQueryDTO {
@ApiModelProperty
(
"所属教师用户ID;为空时查询全部教师"
)
private
String
teacherId
;
@ApiModelProperty
(
"授课班级名称;为空时查询全部班级"
)
private
String
className
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/TeachingPlanAdminUpdateDTO.java
View file @
98b2beaf
...
...
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
/**
* 管理员编辑及审核教案请求。
*
* <p>
正文
结构与教师端保持一致;审核人、审核时间由服务端根据当前登录管理员写入,
* <p>
基本信息、教学环节和教后记
结构与教师端保持一致;审核人、审核时间由服务端根据当前登录管理员写入,
* 因此本对象故意不暴露 reviewerId、reviewerName 和 reviewTime。</p>
*/
@Data
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/TeachingPlanQueryDTO.java
View file @
98b2beaf
...
...
@@ -16,9 +16,12 @@ public class TeachingPlanQueryDTO {
@ApiModelProperty
(
"每页数量,默认 10,最大 100"
)
private
Integer
pageSize
;
@ApiModelProperty
(
"
标题或课程名称
模糊查询关键字"
)
@ApiModelProperty
(
"
教案名称、章节或教师姓名
模糊查询关键字"
)
private
String
keyword
;
@ApiModelProperty
(
"课程类型:ALL/theory/practice"
)
private
String
courseType
;
@ApiModelProperty
(
"ALL/DRAFT/PENDING/APPROVED/REJECTED"
)
private
String
status
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/TeachingPlanSaveDTO.java
View file @
98b2beaf
...
...
@@ -5,42 +5,73 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
java.util.Date
;
import
java.util.List
;
/** 新增或编辑教案的结构化请求;状态及教师归属均不能由本请求修改。 */
/**
* 教师端教案编辑器的保存对象。
*
* <p>字段与 HTML 原型的“基本信息、教学环节、教后记与备注”三个标签页一一对应。
* 状态、教师归属、提交时间和审核信息均由独立接口或服务端登录态维护。</p>
*/
@Data
public
class
TeachingPlanSaveDTO
{
@ApiModelProperty
(
value
=
"教案
标题
,最多
200
个字符"
,
required
=
true
)
@ApiModelProperty
(
value
=
"教案
名称
,最多
50
个字符"
,
required
=
true
)
private
String
title
;
@ApiModelProperty
(
value
=
"课程名称,最多 200 个字符"
,
required
=
true
)
private
String
courseName
;
@ApiModelProperty
(
value
=
"课程类型:theory理论课、practice实训课"
,
required
=
true
)
private
String
courseType
;
@ApiModelProperty
(
value
=
"适用课程"
,
required
=
true
)
private
String
applicableCourse
;
@ApiModelProperty
(
value
=
"职业(等级),如中级工、高级工"
,
required
=
true
)
private
String
vocationalLevel
;
@ApiModelProperty
(
"培训机构;为空时默认实训平台"
)
private
String
trainingInstitution
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@ApiModelProperty
(
value
=
"编写日期"
,
required
=
true
)
private
Date
preparationDate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@ApiModelProperty
(
value
=
"授课日期"
,
required
=
true
)
@ApiModelProperty
(
value
=
"授课日期
,不得早于编写日期
"
,
required
=
true
)
private
Date
teachingDate
;
@ApiModelProperty
(
value
=
"
正整数课时
"
,
required
=
true
)
private
Integer
classHours
;
@ApiModelProperty
(
value
=
"
章节(课题),最多50个字符
"
,
required
=
true
)
private
String
chapterTopic
;
@ApiModelProperty
(
value
=
"
教学目标
"
,
required
=
true
)
private
String
teachingObjectiv
es
;
@ApiModelProperty
(
value
=
"
课时(分钟),范围15至480
"
,
required
=
true
)
private
Integer
durationMinut
es
;
@ApiModelProperty
(
value
=
"
教学内容
"
,
required
=
true
)
private
String
teachingContent
;
@ApiModelProperty
(
value
=
"
授课班级
"
,
required
=
true
)
private
String
className
;
@ApiModelProperty
(
value
=
"教学重点"
,
required
=
true
)
@ApiModelProperty
(
value
=
"教学目的"
,
required
=
true
)
private
String
teachingPurpose
;
@ApiModelProperty
(
"实训内容,仅实训课使用"
)
private
String
practiceContent
;
@ApiModelProperty
(
"实训设备,仅实训课使用"
)
private
String
practiceEquipment
;
@ApiModelProperty
(
"教学重点"
)
private
String
keyPoints
;
@ApiModelProperty
(
value
=
"教学难点"
,
required
=
true
)
@ApiModelProperty
(
"教学难点"
)
private
String
difficultPoints
;
@ApiModelProperty
(
value
=
"教学方法"
,
required
=
true
)
private
String
teachingMethods
;
@ApiModelProperty
(
"教学辅助手段,如多媒体、动画、模型"
)
private
String
teachingAids
;
@ApiModelProperty
(
"教学环节;数组顺序即页面显示顺序"
)
private
List
<
TeachingPlanStepDTO
>
steps
;
@ApiModelProperty
(
value
=
"教学过程"
,
required
=
true
)
private
String
teaching
Process
;
@ApiModelProperty
(
"教学后记,包括课后总结、改进建议和学生反馈"
)
private
String
teaching
Note
;
@ApiModelProperty
(
"
课后总结,可为空
"
)
private
String
afterClassSummary
;
@ApiModelProperty
(
"
教师签名
"
)
private
String
signature
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/TeachingPlanStepDTO.java
0 → 100644
View file @
98b2beaf
package
com.platform.business.model.dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/** 教案编辑器中单个教学环节的保存对象,顺序以请求数组中的位置为准。 */
@Data
public
class
TeachingPlanStepDTO
{
@ApiModelProperty
(
value
=
"教学环节名称,如组织教学、讲授新课"
,
required
=
true
)
private
String
stageName
;
@ApiModelProperty
(
"该环节的教学内容,可为空"
)
private
String
content
;
@ApiModelProperty
(
"该环节采用的教学方法,可为空"
)
private
String
method
;
@ApiModelProperty
(
"环节时长(分钟),可为空;填写时必须为1至480"
)
private
Integer
durationMinutes
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/TeachingPlanEntity.java
View file @
98b2beaf
...
...
@@ -12,10 +12,10 @@ import lombok.Data;
import
java.util.Date
;
/**
* 教师教案主表实体。
* 教师教案主表实体
,对应原型中基本信息和教后记字段
。
*
* <p>
教案使用教师手工录入的课程名称、授课日期和课时,不与排课表绑定;
*
{@code teacherId} 始终由服务端登录态写入,客户端无权指定数据归属
。</p>
* <p>
可重复的教学环节保存在 {@code teaching_plan_step} 子表;教师归属始终由
*
服务端登录态写入,客户端不能通过请求字段修改数据所有者
。</p>
*/
@Data
@TableName
(
"teaching_plan"
)
...
...
@@ -29,29 +29,58 @@ public class TeachingPlanEntity {
@TableField
(
"teacher_id"
)
private
String
teacherId
;
/** 教案
标题
。 */
/** 教案
名称,原型限制最多50个字符
。 */
private
String
title
;
/**
教师手工填写的课程名称,不关联 class_subject
。 */
@TableField
(
"course_
nam
e"
)
private
String
course
Nam
e
;
/**
课程类型:theory 理论课、practice 实训课
。 */
@TableField
(
"course_
typ
e"
)
private
String
course
Typ
e
;
/** 计划授课日期,仅记录日期,不记录具体排课时段。 */
/** 适用课程,例如“污水处理三级”。 */
@TableField
(
"applicable_course"
)
private
String
applicableCourse
;
/** 职业(等级),例如“中级工”或“高级工”。 */
@TableField
(
"vocational_level"
)
private
String
vocationalLevel
;
/** 培训机构,空输入由服务层补为“实训平台”。 */
@TableField
(
"training_institution"
)
private
String
trainingInstitution
;
/** 教案编写日期。 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@TableField
(
"preparation_date"
)
private
Date
preparationDate
;
/** 计划授课日期,不得早于编写日期。 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@TableField
(
"teaching_date"
)
private
Date
teachingDate
;
/**
计划课时,必须为正整数
。 */
@TableField
(
"c
lass_hours
"
)
private
Integer
classHours
;
/**
章节或课题名称
。 */
@TableField
(
"c
hapter_topic
"
)
private
String
chapterTopic
;
/**
教学目标
。 */
@TableField
(
"
teaching_objectiv
es"
)
private
String
teachingObjectiv
es
;
/**
课时长度,单位为分钟,范围15至480
。 */
@TableField
(
"
duration_minut
es"
)
private
Integer
durationMinut
es
;
/** 教学内容。 */
@TableField
(
"teaching_content"
)
private
String
teachingContent
;
/** 授课班级名称。 */
@TableField
(
"class_name"
)
private
String
className
;
/** 教学目的,可按知识、能力、素养目标分行填写。 */
@TableField
(
"teaching_purpose"
)
private
String
teachingPurpose
;
/** 实训内容,仅实训课使用。 */
@TableField
(
"practice_content"
)
private
String
practiceContent
;
/** 实训设备、耗材和安全防护用品,仅实训课使用。 */
@TableField
(
"practice_equipment"
)
private
String
practiceEquipment
;
/** 教学重点。 */
@TableField
(
"key_points"
)
...
...
@@ -61,21 +90,25 @@ public class TeachingPlanEntity {
@TableField
(
"difficult_points"
)
private
String
difficultPoints
;
/** 教学
方法
。 */
@TableField
(
"teaching_
metho
ds"
)
private
String
teaching
Metho
ds
;
/** 教学
辅助手段,例如多媒体、动画、模型或虚拟仿真
。 */
@TableField
(
"teaching_
ai
ds"
)
private
String
teaching
Ai
ds
;
/** 教学
过程
。 */
@TableField
(
"teaching_
process
"
)
private
String
teaching
Process
;
/** 教学
后记,包括课后总结、改进建议和学生反馈
。 */
@TableField
(
"teaching_
note
"
)
private
String
teaching
Note
;
/** 课后总结,可在草稿阶段留空。 */
@TableField
(
"after_class_summary"
)
private
String
afterClassSummary
;
/** 教师签名,可为空。 */
private
String
signature
;
/** 审核展示状态:DRAFT、PENDING、APPROVED、REJECTED。 */
private
String
status
;
/** 教师提交教案的时间;退回草稿后再次提交时刷新。 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
@TableField
(
"submitted_time"
)
private
Date
submittedTime
;
/** 最近一次执行管理端保存操作的管理员用户 ID。 */
@TableField
(
"reviewer_id"
)
private
String
reviewerId
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/TeachingPlanStepEntity.java
0 → 100644
View file @
98b2beaf
package
com.platform.business.model.entity
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
lombok.Data
;
import
java.util.Date
;
/**
* 教案教学环节子表实体。
*
* <p>编辑教案时由服务层在同一事务中删除旧环节并按请求顺序重新插入,
* 因此 {@code sequenceNo} 是稳定的展示依据,不能依赖数据库主键排序。</p>
*/
@Data
@TableName
(
"teaching_plan_step"
)
public
class
TeachingPlanStepEntity
{
/** 教学环节主键,使用 MyBatis-Plus 雪花算法生成。 */
@TableId
(
value
=
"id"
,
type
=
IdType
.
ASSIGN_ID
)
private
String
id
;
/** 所属教案 ID。 */
@TableField
(
"plan_id"
)
private
String
planId
;
/** 教学环节名称。 */
@TableField
(
"stage_name"
)
private
String
stageName
;
/** 该环节的具体教学内容。 */
@TableField
(
"teaching_content"
)
private
String
content
;
/** 该环节采用的教学方法。 */
@TableField
(
"teaching_method"
)
private
String
method
;
/** 该环节预计时长,单位为分钟。 */
@TableField
(
"duration_minutes"
)
private
Integer
durationMinutes
;
/** 环节显示顺序,从1开始。 */
@TableField
(
"sequence_no"
)
private
Integer
sequenceNo
;
/** 创建时间,由项目统一元数据处理器自动填充。 */
@TableField
(
value
=
"create_time"
,
fill
=
FieldFill
.
INSERT
)
private
Date
createTime
;
/** 最后更新时间,由项目统一元数据处理器自动填充。 */
@TableField
(
value
=
"update_time"
,
fill
=
FieldFill
.
INSERT_UPDATE
)
private
Date
updateTime
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/TeachingPlanStepVO.java
0 → 100644
View file @
98b2beaf
package
com.platform.business.model.vo
;
import
lombok.Data
;
/** 教案详情中的教学环节展示对象。 */
@Data
public
class
TeachingPlanStepVO
{
/** 教学环节主键。 */
private
String
id
;
/** 教学环节名称。 */
private
String
stageName
;
/** 该环节的具体教学内容。 */
private
String
content
;
/** 该环节采用的教学方法。 */
private
String
method
;
/** 该环节的预计时长,单位为分钟。 */
private
Integer
durationMinutes
;
/** 环节在教案中的显示顺序,从1开始。 */
private
Integer
sequenceNo
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/TeachingPlanVO.java
View file @
98b2beaf
...
...
@@ -6,28 +6,40 @@ import lombok.Data;
import
java.util.Date
;
import
java.util.List
;
/** 教案列表与详情统一返回对象
,包含结构化正文
和有效附件。 */
/** 教案列表与详情统一返回对象
;详情接口额外装配教学环节
和有效附件。 */
@Data
public
class
TeachingPlanVO
{
private
String
id
;
private
String
teacherId
;
private
String
teacherName
;
private
String
title
;
private
String
courseName
;
private
String
courseType
;
private
String
applicableCourse
;
private
String
vocationalLevel
;
private
String
trainingInstitution
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
preparationDate
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
Date
teachingDate
;
private
Integer
classHours
;
private
String
teachingObjectives
;
private
String
teachingContent
;
private
String
chapterTopic
;
private
Integer
durationMinutes
;
private
String
className
;
private
String
teachingPurpose
;
private
String
practiceContent
;
private
String
practiceEquipment
;
private
String
keyPoints
;
private
String
difficultPoints
;
private
String
teaching
Metho
ds
;
private
String
teaching
Process
;
private
String
afterClassSummary
;
private
String
teaching
Ai
ds
;
private
String
teaching
Note
;
private
String
signature
;
private
String
status
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
submittedTime
;
/** 最近一次执行管理端保存操作的管理员用户ID。 */
private
String
reviewerId
;
...
...
@@ -47,6 +59,9 @@ public class TeachingPlanVO {
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
private
Date
updateTime
;
/** 详情接口按 sequenceNo 升序返回教学环节;列表接口不装配此字段。 */
private
List
<
TeachingPlanStepVO
>
steps
;
/** 当前未逻辑删除且文件仍有效的附件集合。 */
private
List
<
TeachingPlanAttachmentVO
>
attachments
;
}
practical-business/src/main/java/com/platform/business/constant/TeachingPlanConstants.java
View file @
98b2beaf
...
...
@@ -14,7 +14,15 @@ public final class TeachingPlanConstants {
public
static
final
String
STATUS_APPROVED
=
"APPROVED"
;
public
static
final
String
STATUS_REJECTED
=
"REJECTED"
;
/** 标题和课程名称对应数据库 VARCHAR(200)。 */
public
static
final
String
COURSE_TYPE_ALL
=
"ALL"
;
public
static
final
String
COURSE_TYPE_THEORY
=
"theory"
;
public
static
final
String
COURSE_TYPE_PRACTICE
=
"practice"
;
/** 原型对教案名称和章节(课题)的限制均为50个字符。 */
public
static
final
int
MAX_TITLE_LENGTH
=
50
;
public
static
final
int
MAX_CHAPTER_LENGTH
=
50
;
/** 适用课程、职业等级、班级、机构及签名等短文本的数据库安全上限。 */
public
static
final
int
MAX_SHORT_TEXT_LENGTH
=
200
;
/** 单个结构化正文的安全上限,防止异常请求占用过多数据库空间。 */
...
...
@@ -28,28 +36,39 @@ public final class TeachingPlanConstants {
public
static
final
int
MAX_ATTACHMENT_COUNT
=
10
;
public
static
final
long
MAX_ATTACHMENT_SIZE
=
50L
*
1024
*
1024
;
public
static
final
int
MIN_DURATION_MINUTES
=
15
;
public
static
final
int
MAX_DURATION_MINUTES
=
480
;
/** 原型中培训机构输入框的默认值。 */
public
static
final
String
DEFAULT_TRAINING_INSTITUTION
=
"实训平台"
;
public
static
final
Set
<
String
>
STATUSES
=
Collections
.
unmodifiableSet
(
new
HashSet
<>(
Arrays
.
asList
(
STATUS_DRAFT
,
STATUS_PENDING
,
STATUS_APPROVED
,
STATUS_REJECTED
)));
public
static
final
Set
<
String
>
COURSE_TYPES
=
Collections
.
unmodifiableSet
(
new
HashSet
<>(
Arrays
.
asList
(
COURSE_TYPE_THEORY
,
COURSE_TYPE_PRACTICE
)));
public
static
final
Set
<
String
>
ATTACHMENT_EXTENSIONS
=
Collections
.
unmodifiableSet
(
new
HashSet
<>(
Arrays
.
asList
(
"pdf"
,
"doc"
,
"docx"
,
"ppt"
,
"pptx"
"pdf"
,
"doc"
,
"docx"
,
"ppt"
,
"pptx"
,
"mp4"
,
"mov"
,
"avi"
,
"wmv"
,
"webm"
,
"jpg"
,
"jpeg"
,
"png"
,
"gif"
,
"webp"
)));
private
TeachingPlanConstants
()
{
}
/**
* 判断状态流转是否合法。状态机只允许草稿提交、待审核通过或驳回、驳回退回草稿。
* 判断教师端状态流转是否合法。
*
* <p>教师只能提交草稿,或将管理员退回的教案恢复成可编辑草稿;审核通过和
* 退回操作只属于管理端,不能由教师接口伪造。</p>
*/
public
static
boolean
canTransition
(
String
currentStatus
,
String
targetStatus
)
{
if
(
STATUS_DRAFT
.
equals
(
currentStatus
))
{
return
STATUS_PENDING
.
equals
(
targetStatus
);
}
if
(
STATUS_PENDING
.
equals
(
currentStatus
))
{
return
STATUS_APPROVED
.
equals
(
targetStatus
)
||
STATUS_REJECTED
.
equals
(
targetStatus
);
}
return
STATUS_REJECTED
.
equals
(
currentStatus
)
&&
STATUS_DRAFT
.
equals
(
targetStatus
);
}
}
practical-business/src/main/java/com/platform/business/mapper/TeachingPlanMapper.java
View file @
98b2beaf
...
...
@@ -30,7 +30,7 @@ public interface TeachingPlanMapper extends BaseMapper<TeachingPlanEntity> {
TeachingPlanEntity
selectTeacherPlanForUpdate
(
@Param
(
"id"
)
String
id
,
@Param
(
"teacherId"
)
String
teacherId
);
/** 仅更新仍属于当前教师且仍为草稿的教案
正文
。 */
/** 仅更新仍属于当前教师且仍为草稿的教案
主表字段;教学环节由独立 Mapper 替换
。 */
int
updateDraft
(
@Param
(
"plan"
)
TeachingPlanEntity
plan
,
@Param
(
"teacherId"
)
String
teacherId
);
...
...
@@ -56,7 +56,7 @@ public interface TeachingPlanMapper extends BaseMapper<TeachingPlanEntity> {
TeachingPlanEntity
selectAdminPlanForUpdate
(
@Param
(
"id"
)
String
id
);
/**
* 管理员原子更新教案
正文
、任意目标状态和审核信息。
* 管理员原子更新教案
主表字段
、任意目标状态和审核信息。
* WHERE 条件仍限制逻辑删除标记,防止并发删除后继续写入。
*/
int
updateAdmin
(
@Param
(
"plan"
)
TeachingPlanEntity
plan
);
...
...
practical-business/src/main/java/com/platform/business/mapper/TeachingPlanStepMapper.java
0 → 100644
View file @
98b2beaf
package
com.platform.business.mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.platform.business.model.entity.TeachingPlanStepEntity
;
import
com.platform.business.model.vo.TeachingPlanStepVO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/** 教案教学环节数据访问接口。 */
@Mapper
public
interface
TeachingPlanStepMapper
extends
BaseMapper
<
TeachingPlanStepEntity
>
{
/** 按教案 ID 和显式顺序读取全部教学环节。 */
List
<
TeachingPlanStepVO
>
selectByPlanId
(
@Param
(
"planId"
)
String
planId
);
/** 编辑或删除教案时物理删除旧环节,调用方必须处于业务事务中。 */
int
deleteByPlanId
(
@Param
(
"planId"
)
String
planId
);
}
practical-business/src/main/java/com/platform/business/service/impl/TeachingPlanServiceImpl.java
View file @
98b2beaf
This diff is collapsed.
Click to expand it.
practical-business/src/main/resources/com/platform/business/mapper/TeachingPlanMapper.xml
View file @
98b2beaf
...
...
@@ -8,17 +8,25 @@
p.teacher_id AS teacherId,
u.nick_name AS teacherName,
p.title,
p.course_name AS courseName,
p.course_type AS courseType,
p.applicable_course AS applicableCourse,
p.vocational_level AS vocationalLevel,
p.training_institution AS trainingInstitution,
p.preparation_date AS preparationDate,
p.teaching_date AS teachingDate,
p.class_hours AS classHours,
p.teaching_objectives AS teachingObjectives,
p.teaching_content AS teachingContent,
p.chapter_topic AS chapterTopic,
p.duration_minutes AS durationMinutes,
p.class_name AS className,
p.teaching_purpose AS teachingPurpose,
p.practice_content AS practiceContent,
p.practice_equipment AS practiceEquipment,
p.key_points AS keyPoints,
p.difficult_points AS difficultPoints,
p.teaching_
metho
ds AS teaching
Metho
ds,
p.teaching_
process
AS teaching
Process
,
p.
after_class_summary AS afterClassSummary
,
p.teaching_
ai
ds AS teaching
Ai
ds,
p.teaching_
note
AS teaching
Note
,
p.
signature
,
p.status,
p.submitted_time AS submittedTime,
p.reviewer_id AS reviewerId,
p.reviewer_name AS reviewerName,
p.review_opinion AS reviewOpinion,
...
...
@@ -35,7 +43,11 @@
AND p.del_flag = 0
<if
test=
"query.keyword != null and query.keyword != ''"
>
AND (p.title LIKE CONCAT('%', #{query.keyword}, '%')
OR p.course_name LIKE CONCAT('%', #{query.keyword}, '%'))
OR p.chapter_topic LIKE CONCAT('%', #{query.keyword}, '%')
OR u.nick_name LIKE CONCAT('%', #{query.keyword}, '%'))
</if>
<if
test=
"query.courseType != null and query.courseType != '' and query.courseType != 'ALL'"
>
AND p.course_type = #{query.courseType}
</if>
<if
test=
"query.status != null and query.status != '' and query.status != 'ALL'"
>
AND p.status = #{query.status}
...
...
@@ -46,7 +58,7 @@
<if
test=
"query.endDate != null"
>
AND p.teaching_date
<![CDATA[<=]]>
#{query.endDate}
</if>
ORDER BY p.
update_tim
e DESC, p.id DESC
ORDER BY p.
preparation_dat
e DESC, p.id DESC
</select>
<select
id=
"selectTeacherDetail"
resultType=
"com.platform.business.model.vo.TeachingPlanVO"
>
...
...
@@ -73,16 +85,23 @@
<update
id=
"updateDraft"
>
UPDATE teaching_plan
SET title = #{plan.title},
course_name = #{plan.courseName},
course_type = #{plan.courseType},
applicable_course = #{plan.applicableCourse},
vocational_level = #{plan.vocationalLevel},
training_institution = #{plan.trainingInstitution},
preparation_date = #{plan.preparationDate},
teaching_date = #{plan.teachingDate},
class_hours = #{plan.classHours},
teaching_objectives = #{plan.teachingObjectives},
teaching_content = #{plan.teachingContent},
chapter_topic = #{plan.chapterTopic},
duration_minutes = #{plan.durationMinutes},
class_name = #{plan.className},
teaching_purpose = #{plan.teachingPurpose},
practice_content = #{plan.practiceContent},
practice_equipment = #{plan.practiceEquipment},
key_points = #{plan.keyPoints},
difficult_points = #{plan.difficultPoints},
teaching_
metho
ds = #{plan.teaching
Metho
ds},
teaching_
process
= #{plan.teaching
Process
},
after_class_summary = #{plan.afterClassSummary
},
teaching_
ai
ds = #{plan.teaching
Ai
ds},
teaching_
note
= #{plan.teaching
Note
},
signature = #{plan.signature
},
update_time = CURRENT_TIMESTAMP
WHERE id = #{plan.id}
AND teacher_id = #{teacherId}
...
...
@@ -94,6 +113,10 @@
<update
id=
"updateStatus"
>
UPDATE teaching_plan
SET status = #{targetStatus},
submitted_time = CASE
WHEN #{targetStatus} = 'PENDING' THEN CURRENT_TIMESTAMP
ELSE submitted_time
END,
update_time = CURRENT_TIMESTAMP
WHERE id = #{id}
AND teacher_id = #{teacherId}
...
...
@@ -112,7 +135,7 @@
</update>
<!--
管理员分页和Excel导出复用同一查询。关键字覆盖标题、
课程
和教师姓名;
管理员分页和Excel导出复用同一查询。关键字覆盖标题、
章节
和教师姓名;
LIKE查询保留前后模糊匹配,以符合页面搜索体验。
-->
<select
id=
"selectAdminList"
resultType=
"com.platform.business.model.vo.TeachingPlanVO"
>
...
...
@@ -122,9 +145,15 @@
WHERE p.del_flag = 0
<if
test=
"query.keyword != null and query.keyword != ''"
>
AND (p.title LIKE CONCAT('%', #{query.keyword}, '%')
OR p.c
ourse_name
LIKE CONCAT('%', #{query.keyword}, '%')
OR p.c
hapter_topic
LIKE CONCAT('%', #{query.keyword}, '%')
OR u.nick_name LIKE CONCAT('%', #{query.keyword}, '%'))
</if>
<if
test=
"query.courseType != null and query.courseType != '' and query.courseType != 'ALL'"
>
AND p.course_type = #{query.courseType}
</if>
<if
test=
"query.className != null and query.className != ''"
>
AND p.class_name = #{query.className}
</if>
<if
test=
"query.teacherId != null and query.teacherId != ''"
>
AND p.teacher_id = #{query.teacherId}
</if>
...
...
@@ -137,7 +166,7 @@
<if
test=
"query.endDate != null"
>
AND p.teaching_date
<![CDATA[<=]]>
#{query.endDate}
</if>
ORDER BY p.
update_tim
e DESC, p.id DESC
ORDER BY p.
preparation_dat
e DESC, p.id DESC
</select>
<select
id=
"selectAdminDetail"
resultType=
"com.platform.business.model.vo.TeachingPlanVO"
>
...
...
@@ -161,16 +190,23 @@
<update
id=
"updateAdmin"
>
UPDATE teaching_plan
SET title = #{plan.title},
course_name = #{plan.courseName},
course_type = #{plan.courseType},
applicable_course = #{plan.applicableCourse},
vocational_level = #{plan.vocationalLevel},
training_institution = #{plan.trainingInstitution},
preparation_date = #{plan.preparationDate},
teaching_date = #{plan.teachingDate},
class_hours = #{plan.classHours},
teaching_objectives = #{plan.teachingObjectives},
teaching_content = #{plan.teachingContent},
chapter_topic = #{plan.chapterTopic},
duration_minutes = #{plan.durationMinutes},
class_name = #{plan.className},
teaching_purpose = #{plan.teachingPurpose},
practice_content = #{plan.practiceContent},
practice_equipment = #{plan.practiceEquipment},
key_points = #{plan.keyPoints},
difficult_points = #{plan.difficultPoints},
teaching_
metho
ds = #{plan.teaching
Metho
ds},
teaching_
process
= #{plan.teaching
Process
},
after_class_summary = #{plan.afterClassSummary
},
teaching_
ai
ds = #{plan.teaching
Ai
ds},
teaching_
note
= #{plan.teaching
Note
},
signature = #{plan.signature
},
status = #{plan.status},
reviewer_id = #{plan.reviewerId},
reviewer_name = #{plan.reviewerName},
...
...
practical-business/src/main/resources/com/platform/business/mapper/TeachingPlanStepMapper.xml
0 → 100644
View file @
98b2beaf
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.platform.business.mapper.TeachingPlanStepMapper"
>
<!-- 显式按 sequence_no 排序,保证编辑器回填顺序与教师保存时完全一致。 -->
<select
id=
"selectByPlanId"
resultType=
"com.platform.business.model.vo.TeachingPlanStepVO"
>
SELECT id,
stage_name AS stageName,
teaching_content AS content,
teaching_method AS method,
duration_minutes AS durationMinutes,
sequence_no AS sequenceNo
FROM teaching_plan_step
WHERE plan_id = #{planId}
ORDER BY sequence_no ASC, id ASC
</select>
<delete
id=
"deleteByPlanId"
>
DELETE FROM teaching_plan_step
WHERE plan_id = #{planId}
</delete>
</mapper>
practical-business/src/main/resources/sql/teaching_plan.sql
View file @
98b2beaf
...
...
@@ -6,18 +6,26 @@
CREATE
TABLE
IF
NOT
EXISTS
teaching_plan
(
id
VARCHAR
(
32
)
NOT
NULL
COMMENT
'教案ID'
,
teacher_id
VARCHAR
(
64
)
NOT
NULL
COMMENT
'所属教师用户ID'
,
title
VARCHAR
(
200
)
NOT
NULL
COMMENT
'教案标题'
,
course_name
VARCHAR
(
200
)
NOT
NULL
COMMENT
'手工填写的课程名称'
,
title
VARCHAR
(
50
)
NOT
NULL
COMMENT
'教案名称'
,
course_type
VARCHAR
(
16
)
NOT
NULL
COMMENT
'theory理论课/practice实训课'
,
applicable_course
VARCHAR
(
200
)
NOT
NULL
COMMENT
'适用课程'
,
vocational_level
VARCHAR
(
200
)
NOT
NULL
COMMENT
'职业(等级)'
,
training_institution
VARCHAR
(
200
)
NOT
NULL
DEFAULT
'实训平台'
COMMENT
'培训机构'
,
preparation_date
DATE
NOT
NULL
COMMENT
'编写日期'
,
teaching_date
DATE
NOT
NULL
COMMENT
'授课日期'
,
class_hours
INT
NOT
NULL
COMMENT
'正整数课时'
,
teaching_objectives
MEDIUMTEXT
NOT
NULL
COMMENT
'教学目标'
,
teaching_content
MEDIUMTEXT
NOT
NULL
COMMENT
'教学内容'
,
key_points
MEDIUMTEXT
NOT
NULL
COMMENT
'教学重点'
,
difficult_points
MEDIUMTEXT
NOT
NULL
COMMENT
'教学难点'
,
teaching_methods
MEDIUMTEXT
NOT
NULL
COMMENT
'教学方法'
,
teaching_process
MEDIUMTEXT
NOT
NULL
COMMENT
'教学过程'
,
after_class_summary
MEDIUMTEXT
NULL
COMMENT
'课后总结'
,
chapter_topic
VARCHAR
(
50
)
NOT
NULL
COMMENT
'章节(课题)'
,
duration_minutes
INT
NOT
NULL
COMMENT
'课时分钟数,15至480'
,
class_name
VARCHAR
(
200
)
NOT
NULL
COMMENT
'授课班级'
,
teaching_purpose
MEDIUMTEXT
NOT
NULL
COMMENT
'教学目的'
,
practice_content
MEDIUMTEXT
NULL
COMMENT
'实训内容,仅实训课使用'
,
practice_equipment
MEDIUMTEXT
NULL
COMMENT
'实训设备,仅实训课使用'
,
key_points
MEDIUMTEXT
NULL
COMMENT
'教学重点'
,
difficult_points
MEDIUMTEXT
NULL
COMMENT
'教学难点'
,
teaching_aids
MEDIUMTEXT
NULL
COMMENT
'教学辅助手段'
,
teaching_note
MEDIUMTEXT
NULL
COMMENT
'教学后记'
,
signature
VARCHAR
(
200
)
NULL
COMMENT
'教师签名'
,
status
VARCHAR
(
16
)
NOT
NULL
DEFAULT
'DRAFT'
COMMENT
'DRAFT/PENDING/APPROVED/REJECTED'
,
submitted_time
DATETIME
NULL
COMMENT
'最近一次教师提交时间'
,
reviewer_id
VARCHAR
(
64
)
NULL
COMMENT
'最近一次管理端保存的管理员用户ID'
,
reviewer_name
VARCHAR
(
100
)
NULL
COMMENT
'最近一次审核人姓名快照'
,
review_opinion
VARCHAR
(
2000
)
NULL
COMMENT
'最近一次审核意见'
,
...
...
@@ -27,10 +35,26 @@ CREATE TABLE IF NOT EXISTS teaching_plan (
update_time
DATETIME
NOT
NULL
DEFAULT
CURRENT_TIMESTAMP
ON
UPDATE
CURRENT_TIMESTAMP
COMMENT
'更新时间'
,
PRIMARY
KEY
(
id
),
KEY
idx_teaching_plan_teacher_status
(
teacher_id
,
del_flag
,
status
),
KEY
idx_teaching_plan_teacher_
date
(
teacher_id
,
del_flag
,
teaching
_date
),
KEY
idx_teaching_plan_admin_filter
(
del_flag
,
status
,
teaching_dat
e
,
teacher_id
)
KEY
idx_teaching_plan_teacher_
preparation
(
teacher_id
,
del_flag
,
preparation
_date
),
KEY
idx_teaching_plan_admin_filter
_v2
(
del_flag
,
status
,
course_type
,
class_nam
e
,
teacher_id
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COLLATE
=
utf8mb4_unicode_ci
COMMENT
=
'教师教案'
;
-- 教学环节使用独立子表保存,sequence_no 对应编辑器数组顺序。
CREATE
TABLE
IF
NOT
EXISTS
teaching_plan_step
(
id
VARCHAR
(
32
)
NOT
NULL
COMMENT
'教学环节ID'
,
plan_id
VARCHAR
(
32
)
NOT
NULL
COMMENT
'所属教案ID'
,
stage_name
VARCHAR
(
200
)
NOT
NULL
COMMENT
'教学环节名称'
,
teaching_content
MEDIUMTEXT
NULL
COMMENT
'该环节教学内容'
,
teaching_method
VARCHAR
(
200
)
NULL
COMMENT
'该环节教学方法'
,
duration_minutes
INT
NULL
COMMENT
'该环节时长(分钟)'
,
sequence_no
INT
NOT
NULL
COMMENT
'显示顺序,从1开始'
,
create_time
DATETIME
NOT
NULL
DEFAULT
CURRENT_TIMESTAMP
COMMENT
'创建时间'
,
update_time
DATETIME
NOT
NULL
DEFAULT
CURRENT_TIMESTAMP
ON
UPDATE
CURRENT_TIMESTAMP
COMMENT
'更新时间'
,
PRIMARY
KEY
(
id
),
UNIQUE
KEY
uk_teaching_plan_step_sequence
(
plan_id
,
sequence_no
),
KEY
idx_teaching_plan_step_plan
(
plan_id
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COLLATE
=
utf8mb4_unicode_ci
COMMENT
=
'教案教学环节'
;
CREATE
TABLE
IF
NOT
EXISTS
teaching_plan_attachment
(
id
VARCHAR
(
32
)
NOT
NULL
COMMENT
'附件关联ID'
,
plan_id
VARCHAR
(
32
)
NOT
NULL
COMMENT
'教案ID'
,
...
...
@@ -46,16 +70,61 @@ CREATE TABLE IF NOT EXISTS teaching_plan_attachment (
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COLLATE
=
utf8mb4_unicode_ci
COMMENT
=
'教案附件关联'
;
--
-- 管理端审核字段增量迁移。
--
HTML 原型字段及
管理端审核字段
的
增量迁移。
-- teaching_plan 可能已由旧版本脚本创建,因此不能只依赖上面的 CREATE TABLE IF NOT EXISTS;
-- 下面逐项检查字段和索引,允许本脚本在开发、测试和生产环境安全重复执行。
-- 旧的已通过/已驳回记录没有可信审核人来源,迁移时有意保持审核字段为 NULL。
-- 新字段先按可空方式加入并回填旧数据,最后再收紧原型必填字段,整个过程可重复执行。
--
DELIMITER
$$
DROP
PROCEDURE
IF
EXISTS
migrate_teaching_plan_
admin
$$
CREATE
PROCEDURE
migrate_teaching_plan_
admin
()
DROP
PROCEDURE
IF
EXISTS
migrate_teaching_plan_
v2
$$
CREATE
PROCEDURE
migrate_teaching_plan_
v2
()
BEGIN
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'course_type'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
course_type
VARCHAR
(
16
)
NULL
COMMENT
'theory理论课/practice实训课'
AFTER
title
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'applicable_course'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
applicable_course
VARCHAR
(
200
)
NULL
COMMENT
'适用课程'
AFTER
course_type
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'vocational_level'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
vocational_level
VARCHAR
(
200
)
NULL
COMMENT
'职业(等级)'
AFTER
applicable_course
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'training_institution'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
training_institution
VARCHAR
(
200
)
NULL
COMMENT
'培训机构'
AFTER
vocational_level
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'preparation_date'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
preparation_date
DATE
NULL
COMMENT
'编写日期'
AFTER
training_institution
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'chapter_topic'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
chapter_topic
VARCHAR
(
50
)
NULL
COMMENT
'章节(课题)'
AFTER
teaching_date
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'duration_minutes'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
duration_minutes
INT
NULL
COMMENT
'课时分钟数,15至480'
AFTER
chapter_topic
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'class_name'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
class_name
VARCHAR
(
200
)
NULL
COMMENT
'授课班级'
AFTER
duration_minutes
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'teaching_purpose'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
teaching_purpose
MEDIUMTEXT
NULL
COMMENT
'教学目的'
AFTER
class_name
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'practice_content'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
practice_content
MEDIUMTEXT
NULL
COMMENT
'实训内容,仅实训课使用'
AFTER
teaching_purpose
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'practice_equipment'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
practice_equipment
MEDIUMTEXT
NULL
COMMENT
'实训设备,仅实训课使用'
AFTER
practice_content
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'teaching_aids'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
teaching_aids
MEDIUMTEXT
NULL
COMMENT
'教学辅助手段'
AFTER
difficult_points
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'teaching_note'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
teaching_note
MEDIUMTEXT
NULL
COMMENT
'教学后记'
AFTER
teaching_aids
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'signature'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
signature
VARCHAR
(
200
)
NULL
COMMENT
'教师签名'
AFTER
teaching_note
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'submitted_time'
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
submitted_time
DATETIME
NULL
COMMENT
'最近一次教师提交时间'
AFTER
status
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
...
...
@@ -64,7 +133,7 @@ BEGIN
)
THEN
ALTER
TABLE
teaching_plan
ADD
COLUMN
reviewer_id
VARCHAR
(
64
)
NULL
COMMENT
'最近一次管理端保存的管理员用户ID'
AFTER
s
tatus
;
COMMENT
'最近一次管理端保存的管理员用户ID'
AFTER
s
ubmitted_time
;
END
IF
;
IF
NOT
EXISTS
(
...
...
@@ -100,19 +169,55 @@ BEGIN
COMMENT
'最近一次管理端保存或审核时间'
AFTER
review_opinion
;
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
statistics
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
index_name
=
'idx_teaching_plan_admin_filter'
)
THEN
-- 旧版课程、课时和正文有可复用数据时做保守映射,其余新增必填项使用可识别占位值。
IF
EXISTS
(
SELECT
1
FROM
information_schema
.
columns
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
column_name
=
'course_name'
)
THEN
SET
@
teaching_plan_backfill
=
'UPDATE teaching_plan SET applicable_course = COALESCE(NULLIF(applicable_course,
''''
), course_name), duration_minutes = COALESCE(duration_minutes, LEAST(480, GREATEST(15, class_hours * 45))), teaching_purpose = COALESCE(NULLIF(teaching_purpose,
''''
), teaching_objectives), teaching_aids = COALESCE(NULLIF(teaching_aids,
''''
), teaching_methods), teaching_note = COALESCE(NULLIF(teaching_note,
''''
), after_class_summary)'
;
PREPARE
teaching_plan_stmt
FROM
@
teaching_plan_backfill
;
EXECUTE
teaching_plan_stmt
;
DEALLOCATE
PREPARE
teaching_plan_stmt
;
-- 旧字段保留为兼容列,但解除非空约束,避免新版写入必须继续维护废弃字段。
ALTER
TABLE
teaching_plan
ADD
INDEX
idx_teaching_plan_admin_filter
(
del_flag
,
status
,
teaching_date
,
teacher_id
);
MODIFY
COLUMN
course_name
VARCHAR
(
200
)
NULL
,
MODIFY
COLUMN
class_hours
INT
NULL
,
MODIFY
COLUMN
teaching_objectives
MEDIUMTEXT
NULL
,
MODIFY
COLUMN
teaching_content
MEDIUMTEXT
NULL
,
MODIFY
COLUMN
teaching_methods
MEDIUMTEXT
NULL
,
MODIFY
COLUMN
teaching_process
MEDIUMTEXT
NULL
;
END
IF
;
UPDATE
teaching_plan
SET
course_type
=
COALESCE
(
NULLIF
(
course_type
,
''
),
'theory'
),
applicable_course
=
COALESCE
(
NULLIF
(
applicable_course
,
''
),
'未设置'
),
vocational_level
=
COALESCE
(
NULLIF
(
vocational_level
,
''
),
'未设置'
),
training_institution
=
COALESCE
(
NULLIF
(
training_institution
,
''
),
'实训平台'
),
preparation_date
=
COALESCE
(
preparation_date
,
DATE
(
create_time
),
teaching_date
),
chapter_topic
=
COALESCE
(
NULLIF
(
chapter_topic
,
''
),
LEFT
(
title
,
50
)),
duration_minutes
=
COALESCE
(
duration_minutes
,
90
),
class_name
=
COALESCE
(
NULLIF
(
class_name
,
''
),
'未设置'
),
teaching_purpose
=
COALESCE
(
NULLIF
(
teaching_purpose
,
''
),
'待补充'
);
ALTER
TABLE
teaching_plan
MODIFY
COLUMN
course_type
VARCHAR
(
16
)
NOT
NULL
,
MODIFY
COLUMN
applicable_course
VARCHAR
(
200
)
NOT
NULL
,
MODIFY
COLUMN
vocational_level
VARCHAR
(
200
)
NOT
NULL
,
MODIFY
COLUMN
training_institution
VARCHAR
(
200
)
NOT
NULL
DEFAULT
'实训平台'
,
MODIFY
COLUMN
preparation_date
DATE
NOT
NULL
,
MODIFY
COLUMN
chapter_topic
VARCHAR
(
50
)
NOT
NULL
,
MODIFY
COLUMN
duration_minutes
INT
NOT
NULL
,
MODIFY
COLUMN
class_name
VARCHAR
(
200
)
NOT
NULL
,
MODIFY
COLUMN
teaching_purpose
MEDIUMTEXT
NOT
NULL
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
statistics
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
index_name
=
'idx_teaching_plan_teacher_preparation'
)
THEN
ALTER
TABLE
teaching_plan
ADD
INDEX
idx_teaching_plan_teacher_preparation
(
teacher_id
,
del_flag
,
preparation_date
);
END
IF
;
IF
NOT
EXISTS
(
SELECT
1
FROM
information_schema
.
statistics
WHERE
table_schema
=
DATABASE
()
AND
table_name
=
'teaching_plan'
AND
index_name
=
'idx_teaching_plan_admin_filter_v2'
)
THEN
ALTER
TABLE
teaching_plan
ADD
INDEX
idx_teaching_plan_admin_filter_v2
(
del_flag
,
status
,
course_type
,
class_name
,
teacher_id
);
END
IF
;
END
$$
CALL
migrate_teaching_plan_
admin
()
$$
DROP
PROCEDURE
IF
EXISTS
migrate_teaching_plan_
admin
$$
CALL
migrate_teaching_plan_
v2
()
$$
DROP
PROCEDURE
IF
EXISTS
migrate_teaching_plan_
v2
$$
DELIMITER
;
practical-business/src/main/resources/teaching-plan-api.md
View file @
98b2beaf
...
...
@@ -3,7 +3,7 @@
教师端接口统一使用前缀
`/teaching/plan/teacher`
,并从请求头
`Authorization`
解析当前用户。
服务端要求用户具有
`phone_role.role_name=教师`
,且不会接收客户端传入的
`teacherId`
。
部署前执行
`src/main/resources/sql/teaching_plan.sql`
创建教案主表和附件关联表。
部署前执行
`src/main/resources/sql/teaching_plan.sql`
创建教案主表
、教学环节子表
和附件关联表。
## 1. 分页查询教案
...
...
@@ -14,14 +14,16 @@
"pageNum"
:
1
,
"pageSize"
:
10
,
"keyword"
:
"高处作业"
,
"courseType"
:
"theory"
,
"status"
:
"DRAFT"
,
"startDate"
:
"2026-08-01"
,
"endDate"
:
"2026-08-31"
}
```
`status`
支持
`ALL`
、
`DRAFT`
、
`PENDING`
、
`APPROVED`
、
`REJECTED`
。关键字同时匹配教案标题和课程名称,
日期范围包含起止日期。返回项目统一的
`TableDataInfo`
分页结构,每条教案均包含当前有效附件。
`courseType`
支持
`ALL`
、
`theory`
、
`practice`
;
`status`
支持
`ALL`
、
`DRAFT`
、
`PENDING`
、
`APPROVED`
、
`REJECTED`
。关键字同时匹配教案名称、章节和教师姓名,日期范围包含起止日期。
列表默认按编写日期倒序,返回项目统一的
`TableDataInfo`
分页结构。
## 2. 新增、详情、编辑和删除
...
...
@@ -35,21 +37,37 @@
```
json
{
"title"
:
"高处作业安全教案"
,
"courseName"
:
"高处作业安全"
,
"courseType"
:
"theory"
,
"applicableCourse"
:
"污水处理一级"
,
"vocationalLevel"
:
"初级工"
,
"trainingInstitution"
:
"实训平台"
,
"preparationDate"
:
"2026-08-18"
,
"teachingDate"
:
"2026-08-20"
,
"classHours"
:
2
,
"teachingObjectives"
:
"掌握高处作业基本安全要求"
,
"teachingContent"
:
"安全防护用品使用和风险识别"
,
"chapterTopic"
:
"第一章 高处作业安全"
,
"durationMinutes"
:
90
,
"className"
:
"污水处理一级一班"
,
"teachingPurpose"
:
"1. 知识目标:掌握安全要求
\n
2. 能力目标:正确使用防护用品"
,
"practiceContent"
:
null
,
"practiceEquipment"
:
null
,
"keyPoints"
:
"正确使用安全带"
,
"difficultPoints"
:
"复杂环境风险识别"
,
"teachingMethods"
:
"讲授、演示与案例讨论"
,
"teachingProcess"
:
"导入、讲授、演示、练习和总结"
,
"afterClassSummary"
:
"选填的课后总结"
"teachingAids"
:
"安全带实物与事故案例视频"
,
"steps"
:
[
{
"stageName"
:
"讲授新课"
,
"content"
:
"安全防护用品使用和风险识别"
,
"method"
:
"讲授与演示"
,
"durationMinutes"
:
60
}
],
"teachingNote"
:
"选填的教学后记"
,
"signature"
:
"王老师"
}
```
标题和课程名称最多 200 个字符;六个教学正文均为必填项且单项最多 20000 个字符;课时必须为正整数。
状态不是
`DRAFT`
时,编辑和删除接口都会拒绝操作。
教案名称和章节最多 50 个字符;课时范围为 15 至 480 分钟;授课日期不得早于编写日期。
基本信息中的必填字段与 HTML 原型一致,教学环节只要存在就必须填写环节名称。理论课保存时会清空隐藏的
实训内容和实训设备。编辑教学环节采用事务内全量替换,状态不是
`DRAFT`
时拒绝编辑和删除。
## 3. 状态流转
...
...
@@ -61,14 +79,13 @@
}
```
本期状态由教案所属教师本人维护,不记录审核意见或历史。只允许以下流转
:
教师端只允许以下流转,审核通过和退回由管理员端执行
:
-
`DRAFT → PENDING`
-
`PENDING → APPROVED`
-
`PENDING → REJECTED`
-
`REJECTED → DRAFT`
`APPROVED`
为终态。驳回教案必须先退回
`DRAFT`
,才能继续编辑、删除或管理附件。
提交时记录
`submittedTime`
;再次提交会刷新该时间。驳回教案必须先恢复为
`DRAFT`
,才能继续编辑、
删除或管理附件。
## 4. 附件
...
...
@@ -76,16 +93,16 @@
-
`DELETE /teaching/plan/teacher/{id}/attachments/{attachmentId}`
:删除单个草稿附件。
-
`GET /teaching/plan/teacher/{id}/attachments/{attachmentId}/download`
:校验教师、教案和附件关系后下载。
每份教案最多保留 10 个附件,支持
PDF、DOC、DOCX、PPT、PPTX
,扩展名不区分大小写,单个附件
不得超过
50 MiB。上传和删除附件仅允许在
`DRAFT`
状态执行;下载在任意有效状态均可执行。
接口不返回服务器文件路径。
每份教案最多保留 10 个附件,支持
常见演示文稿、文档、视频和图片格式
,扩展名不区分大小写,单个附件
不得超过
50 MiB。上传和删除附件仅允许在
`DRAFT`
状态执行;下载在任意有效状态均可执行。
## 5. 管理员端接口约定
管理员接口统一使用前缀
`/teaching/plan/admin`
。每个入口都会从
`Authorization`
中解析当前用户,
并要求
`phone_role.role_name=管理员`
。审核人 ID、审核人姓名和审核时间均由服务端写入,前端无法指定。
管理员
使用
与教师端
相同的简化正文结构,不包含原型中的班级、课程类型、章节、职业等级和结构化教学环节。
管理员可编辑任意有效教案,并可直接设置
`DRAFT`
、
`PENDING`
、
`APPROVED`
或
`REJECTED`
,不受教师端状态机限制。
管理员与教师端
共享完整原型字段和教学环节数据。管理员可编辑任意有效教案,并可直接设置
`DRAFT`
、
`PENDING`
、
`APPROVED`
或
`REJECTED`
,不受教师端状态机限制。
### 5.1 分页查询
...
...
@@ -97,13 +114,16 @@
"pageSize"
:
10
,
"keyword"
:
"高处作业"
,
"teacherId"
:
"190000000000000001"
,
"className"
:
"污水处理一级一班"
,
"courseType"
:
"theory"
,
"status"
:
"APPROVED"
,
"startDate"
:
"2026-08-01"
,
"endDate"
:
"2026-08-31"
}
```
-
`keyword`
同时模糊匹配教案标题、课程名称和教师姓名。
-
`keyword`
同时模糊匹配教案名称、章节和教师姓名。
-
`className`
按授课班级精确筛选,
`courseType`
按理论课/实训课精确筛选。
-
`teacherId`
为空时查询全部教师。
-
`status`
为空或
`ALL`
时查询全部状态,状态值不区分大小写。
-
日期范围按授课日期筛选并包含起止日。
...
...
@@ -133,16 +153,22 @@
```
json
{
"title"
:
"高处作业安全教案"
,
"courseName"
:
"高处作业安全"
,
"courseType"
:
"theory"
,
"applicableCourse"
:
"污水处理一级"
,
"vocationalLevel"
:
"初级工"
,
"trainingInstitution"
:
"实训平台"
,
"preparationDate"
:
"2026-08-18"
,
"teachingDate"
:
"2026-08-20"
,
"classHours"
:
2
,
"teachingObjectives"
:
"掌握高处作业基本安全要求"
,
"teachingContent"
:
"安全防护用品使用和风险识别"
,
"chapterTopic"
:
"第一章 高处作业安全"
,
"durationMinutes"
:
90
,
"className"
:
"污水处理一级一班"
,
"teachingPurpose"
:
"掌握高处作业基本安全要求"
,
"keyPoints"
:
"正确使用安全带"
,
"difficultPoints"
:
"复杂环境风险识别"
,
"teachingMethods"
:
"讲授、演示与案例讨论"
,
"teachingProcess"
:
"导入、讲授、演示、练习和总结"
,
"afterClassSummary"
:
"课堂目标已完成"
,
"teachingAids"
:
"安全带实物与事故案例视频"
,
"steps"
:
[],
"teachingNote"
:
"课堂目标已完成"
,
"signature"
:
"王老师"
,
"status"
:
"APPROVED"
,
"reviewOpinion"
:
"内容完整,同意通过"
}
...
...
@@ -154,14 +180,18 @@
### 5.4 导出
-
`POST /teaching/plan/admin/export`
:请求体与分页查询一致,但忽略
`pageNum/pageSize`
,将全部匹配记录导出为 Excel。
-
`GET /teaching/plan/admin/{id}/export`
:导出单份 Word 教案,包含全部
简化正文
、教师信息、审核信息和附件名称。
-
`GET /teaching/plan/admin/{id}/export`
:导出单份 Word 教案,包含全部
原型字段、教学环节
、教师信息、审核信息和附件名称。
下载响应使用标准 Office MIME 类型和
`filename*=UTF-8''...`
响应头,前端应以二进制 Blob 接收。
## 6. 数据库升级
新部署和旧环境均执行
`src/main/resources/sql/teaching_plan.sql`
。脚本会创建缺失表,并通过
`information_schema`
幂等补充以下管理端字段和筛选索引:
`information_schema`
幂等补充原型字段、教学环节子表、管理端审核字段和筛选索引。旧版字段会被保守映射到
新字段:课程名称映射为适用课程、课时数按每课时 45 分钟映射、教学目标映射为教学目的;无法可靠推导的
职业等级、班级等字段使用“未设置”占位,便于管理员后续补录。
管理端审核字段包括:
-
`reviewer_id`
:最近一次管理端保存的管理员用户 ID。
-
`reviewer_name`
:审核人姓名快照。
...
...
practical-business/src/test/java/com/platform/business/mapper/TeachingPlanMapperXmlTest.java
View file @
98b2beaf
...
...
@@ -9,7 +9,7 @@ import java.io.InputStream;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertTrue
;
/** 确保教案
管理端新增
SQL在应用启动前即可被MyBatis完整解析和注册。 */
/** 确保教案
主表和教学环节
SQL
在应用启动前即可被
MyBatis
完整解析和注册。 */
class
TeachingPlanMapperXmlTest
{
@Test
...
...
@@ -29,4 +29,19 @@ class TeachingPlanMapperXmlTest {
assertTrue
(
configuration
.
hasStatement
(
namespace
+
"updateAdmin"
));
assertTrue
(
configuration
.
hasStatement
(
namespace
+
"selectAdminTeacherOptions"
));
}
@Test
void
stepMapperXmlShouldParseAndRegisterReplaceStatements
()
throws
Exception
{
String
resource
=
"com/platform/business/mapper/TeachingPlanStepMapper.xml"
;
Configuration
configuration
=
new
Configuration
();
try
(
InputStream
input
=
Resources
.
getResourceAsStream
(
resource
))
{
XMLMapperBuilder
builder
=
new
XMLMapperBuilder
(
input
,
configuration
,
resource
,
configuration
.
getSqlFragments
());
builder
.
parse
();
}
String
namespace
=
"com.platform.business.mapper.TeachingPlanStepMapper."
;
assertTrue
(
configuration
.
hasStatement
(
namespace
+
"selectByPlanId"
));
assertTrue
(
configuration
.
hasStatement
(
namespace
+
"deleteByPlanId"
));
}
}
practical-business/src/test/java/com/platform/business/service/impl/TeachingPlanAdminServiceImplTest.java
View file @
98b2beaf
...
...
@@ -3,6 +3,7 @@ package com.platform.business.service.impl;
import
com.platform.business.constant.TeachingPlanConstants
;
import
com.platform.business.mapper.TeachingPlanAttachmentMapper
;
import
com.platform.business.mapper.TeachingPlanMapper
;
import
com.platform.business.mapper.TeachingPlanStepMapper
;
import
com.platform.business.model.dto.TeachingPlanAdminQueryDTO
;
import
com.platform.business.model.dto.TeachingPlanAdminUpdateDTO
;
import
com.platform.business.model.entity.TeachingPlanEntity
;
...
...
@@ -44,6 +45,9 @@ class TeachingPlanAdminServiceImplTest {
@Mock
private
TeachingPlanAttachmentMapper
attachmentMapper
;
@Mock
private
TeachingPlanStepMapper
stepMapper
;
@Mock
private
BsFileService
bsFileService
;
...
...
@@ -56,12 +60,16 @@ class TeachingPlanAdminServiceImplTest {
TeachingPlanAdminQueryDTO
query
=
new
TeachingPlanAdminQueryDTO
();
query
.
setKeyword
(
" 安全课 "
);
query
.
setTeacherId
(
" teacher-1 "
);
query
.
setClassName
(
" 污水处理一级一班 "
);
query
.
setCourseType
(
"THEORY"
);
query
.
setStatus
(
"approved"
);
teachingPlanService
.
adminList
(
query
);
assertEquals
(
"安全课"
,
query
.
getKeyword
());
assertEquals
(
"teacher-1"
,
query
.
getTeacherId
());
assertEquals
(
"污水处理一级一班"
,
query
.
getClassName
());
assertEquals
(
TeachingPlanConstants
.
COURSE_TYPE_THEORY
,
query
.
getCourseType
());
assertEquals
(
TeachingPlanConstants
.
STATUS_APPROVED
,
query
.
getStatus
());
}
...
...
@@ -180,16 +188,21 @@ class TeachingPlanAdminServiceImplTest {
private
TeachingPlanAdminUpdateDTO
validRequest
()
{
TeachingPlanAdminUpdateDTO
request
=
new
TeachingPlanAdminUpdateDTO
();
request
.
setTitle
(
"高处作业安全教案"
);
request
.
setCourseName
(
"高处作业安全"
);
request
.
setCourseType
(
TeachingPlanConstants
.
COURSE_TYPE_THEORY
);
request
.
setApplicableCourse
(
"污水处理一级"
);
request
.
setVocationalLevel
(
"初级工"
);
request
.
setPreparationDate
(
new
Date
());
request
.
setTeachingDate
(
new
Date
());
request
.
setClassHours
(
2
);
request
.
setTeachingObjectives
(
"掌握高处作业基本安全要求"
);
request
.
setTeachingContent
(
"安全防护用品使用和风险识别"
);
request
.
setChapterTopic
(
"第一章 高处作业安全"
);
request
.
setDurationMinutes
(
90
);
request
.
setClassName
(
"污水处理一级一班"
);
request
.
setTeachingPurpose
(
"掌握高处作业基本安全要求"
);
request
.
setKeyPoints
(
"正确使用安全带"
);
request
.
setDifficultPoints
(
"复杂环境风险识别"
);
request
.
setTeachingMethods
(
"讲授、演示与案例讨论"
);
request
.
setTeachingProcess
(
"导入、讲授、演示、练习和总结"
);
request
.
setAfterClassSummary
(
"课堂目标已完成"
);
request
.
setTeachingAids
(
"安全带实物与事故案例视频"
);
request
.
setTeachingNote
(
"课堂目标已完成"
);
request
.
setSignature
(
"王老师"
);
request
.
setSteps
(
Collections
.
emptyList
());
return
request
;
}
...
...
@@ -199,16 +212,21 @@ class TeachingPlanAdminServiceImplTest {
plan
.
setTeacherId
(
"teacher-1"
);
plan
.
setTeacherName
(
"王老师"
);
plan
.
setTitle
(
"高处作业安全教案"
);
plan
.
setCourseName
(
"高处作业安全"
);
plan
.
setCourseType
(
TeachingPlanConstants
.
COURSE_TYPE_THEORY
);
plan
.
setApplicableCourse
(
"污水处理一级"
);
plan
.
setVocationalLevel
(
"初级工"
);
plan
.
setTrainingInstitution
(
"实训平台"
);
plan
.
setPreparationDate
(
new
Date
());
plan
.
setTeachingDate
(
new
Date
());
plan
.
setClassHours
(
2
);
plan
.
setTeachingObjectives
(
"掌握安全要求"
);
plan
.
setTeachingContent
(
"安全防护用品使用"
);
plan
.
setChapterTopic
(
"第一章 高处作业安全"
);
plan
.
setDurationMinutes
(
90
);
plan
.
setClassName
(
"污水处理一级一班"
);
plan
.
setTeachingPurpose
(
"掌握安全要求"
);
plan
.
setKeyPoints
(
"正确使用安全带"
);
plan
.
setDifficultPoints
(
"风险识别"
);
plan
.
setTeaching
Methods
(
"讲授与演示
"
);
plan
.
setTeaching
Process
(
"导入、讲授和总结
"
);
plan
.
set
AfterClassSummary
(
"目标已完成
"
);
plan
.
setTeaching
Aids
(
"实物与视频
"
);
plan
.
setTeaching
Note
(
"目标已完成
"
);
plan
.
set
Signature
(
"王老师
"
);
plan
.
setStatus
(
TeachingPlanConstants
.
STATUS_APPROVED
);
plan
.
setUpdateTime
(
new
Date
());
return
plan
;
...
...
practical-business/src/test/java/com/platform/business/service/impl/TeachingPlanServiceImplTest.java
View file @
98b2beaf
...
...
@@ -3,12 +3,15 @@ package com.platform.business.service.impl;
import
com.platform.business.constant.TeachingPlanConstants
;
import
com.platform.business.mapper.TeachingPlanAttachmentMapper
;
import
com.platform.business.mapper.TeachingPlanMapper
;
import
com.platform.business.mapper.TeachingPlanStepMapper
;
import
com.platform.business.model.dto.TeachingPlanQueryDTO
;
import
com.platform.business.model.dto.TeachingPlanSaveDTO
;
import
com.platform.business.model.dto.TeachingPlanStatusDTO
;
import
com.platform.business.model.dto.TeachingPlanStepDTO
;
import
com.platform.business.model.entity.BsFileEntity
;
import
com.platform.business.model.entity.TeachingPlanAttachmentEntity
;
import
com.platform.business.model.entity.TeachingPlanEntity
;
import
com.platform.business.model.entity.TeachingPlanStepEntity
;
import
com.platform.business.model.vo.TeachingPlanVO
;
import
com.platform.business.service.BsFileService
;
import
com.platform.exception.BusinessException
;
...
...
@@ -57,6 +60,9 @@ class TeachingPlanServiceImplTest {
@Mock
private
TeachingPlanAttachmentMapper
attachmentMapper
;
@Mock
private
TeachingPlanStepMapper
stepMapper
;
@Mock
private
BsFileService
bsFileService
;
...
...
@@ -86,10 +92,57 @@ class TeachingPlanServiceImplTest {
assertEquals
(
TeachingPlanConstants
.
STATUS_DRAFT
,
result
.
getStatus
());
}
@Test
void
createShouldPersistOrderedStepsAndApplyInstitutionDefault
()
{
when
(
teachingPlanMapper
.
insert
(
any
(
TeachingPlanEntity
.
class
))).
thenReturn
(
1
);
when
(
stepMapper
.
insert
(
any
(
TeachingPlanStepEntity
.
class
))).
thenReturn
(
1
);
when
(
teachingPlanMapper
.
selectTeacherDetail
(
anyString
(),
eq
(
TEACHER_ID
)))
.
thenAnswer
(
invocation
->
{
TeachingPlanVO
vo
=
new
TeachingPlanVO
();
vo
.
setId
(
invocation
.
getArgument
(
0
));
return
vo
;
});
when
(
attachmentMapper
.
selectByPlanIds
(
anyList
())).
thenReturn
(
Collections
.
emptyList
());
TeachingPlanStepDTO
step
=
new
TeachingPlanStepDTO
();
step
.
setStageName
(
" 组织教学 "
);
step
.
setContent
(
" 考勤和安全提醒 "
);
step
.
setMethod
(
" 口头讲解 "
);
step
.
setDurationMinutes
(
10
);
TeachingPlanSaveDTO
request
=
validRequest
();
request
.
setTrainingInstitution
(
" "
);
request
.
setSteps
(
Collections
.
singletonList
(
step
));
teachingPlanService
.
create
(
request
,
TEACHER_ID
);
ArgumentCaptor
<
TeachingPlanEntity
>
planCaptor
=
ArgumentCaptor
.
forClass
(
TeachingPlanEntity
.
class
);
verify
(
teachingPlanMapper
).
insert
(
planCaptor
.
capture
());
assertEquals
(
TeachingPlanConstants
.
DEFAULT_TRAINING_INSTITUTION
,
planCaptor
.
getValue
().
getTrainingInstitution
());
ArgumentCaptor
<
TeachingPlanStepEntity
>
stepCaptor
=
ArgumentCaptor
.
forClass
(
TeachingPlanStepEntity
.
class
);
verify
(
stepMapper
).
insert
(
stepCaptor
.
capture
());
assertEquals
(
"组织教学"
,
stepCaptor
.
getValue
().
getStageName
());
assertEquals
(
"考勤和安全提醒"
,
stepCaptor
.
getValue
().
getContent
());
assertEquals
(
1
,
stepCaptor
.
getValue
().
getSequenceNo
());
}
@Test
void
createShouldRejectMissingRequiredContent
()
{
TeachingPlanSaveDTO
request
=
validRequest
();
request
.
setTeachingObjectives
(
" "
);
request
.
setTeachingPurpose
(
" "
);
assertThrows
(
BusinessException
.
class
,
()
->
teachingPlanService
.
create
(
request
,
TEACHER_ID
));
verify
(
teachingPlanMapper
,
never
()).
insert
(
any
());
}
@Test
void
createShouldRejectTeachingDateBeforePreparationDate
()
{
TeachingPlanSaveDTO
request
=
validRequest
();
request
.
setPreparationDate
(
new
Date
(
2_000L
));
request
.
setTeachingDate
(
new
Date
(
1_000L
));
assertThrows
(
BusinessException
.
class
,
()
->
teachingPlanService
.
create
(
request
,
TEACHER_ID
));
...
...
@@ -102,11 +155,13 @@ class TeachingPlanServiceImplTest {
.
thenReturn
(
Collections
.
emptyList
());
TeachingPlanQueryDTO
query
=
new
TeachingPlanQueryDTO
();
query
.
setKeyword
(
" 安全课 "
);
query
.
setCourseType
(
"PRACTICE"
);
query
.
setStatus
(
"pending"
);
teachingPlanService
.
list
(
query
,
TEACHER_ID
);
assertEquals
(
"安全课"
,
query
.
getKeyword
());
assertEquals
(
TeachingPlanConstants
.
COURSE_TYPE_PRACTICE
,
query
.
getCourseType
());
assertEquals
(
TeachingPlanConstants
.
STATUS_PENDING
,
query
.
getStatus
());
}
...
...
@@ -153,8 +208,6 @@ class TeachingPlanServiceImplTest {
@ParameterizedTest
@CsvSource
({
"DRAFT,PENDING"
,
"PENDING,APPROVED"
,
"PENDING,REJECTED"
,
"REJECTED,DRAFT"
})
void
updateStatusShouldAllowEveryDefinedTransition
(
String
currentStatus
,
String
targetStatus
)
{
...
...
@@ -277,7 +330,7 @@ class TeachingPlanServiceImplTest {
}
@Test
void
statusTransitionMatrixShouldContainOnly
FourAllow
edEdges
()
{
void
statusTransitionMatrixShouldContainOnly
TeacherOwn
edEdges
()
{
String
[]
statuses
=
{
TeachingPlanConstants
.
STATUS_DRAFT
,
TeachingPlanConstants
.
STATUS_PENDING
,
...
...
@@ -292,8 +345,9 @@ class TeachingPlanServiceImplTest {
}
}
}
assertEquals
(
4
,
allowed
);
assertEquals
(
2
,
allowed
);
assertTrue
(
TeachingPlanConstants
.
canTransition
(
"REJECTED"
,
"DRAFT"
));
assertFalse
(
TeachingPlanConstants
.
canTransition
(
"PENDING"
,
"APPROVED"
));
assertFalse
(
TeachingPlanConstants
.
canTransition
(
"APPROVED"
,
"DRAFT"
));
}
...
...
@@ -309,16 +363,21 @@ class TeachingPlanServiceImplTest {
private
TeachingPlanSaveDTO
validRequest
()
{
TeachingPlanSaveDTO
request
=
new
TeachingPlanSaveDTO
();
request
.
setTitle
(
"高处作业安全教案"
);
request
.
setCourseName
(
"高处作业安全"
);
request
.
setCourseType
(
TeachingPlanConstants
.
COURSE_TYPE_THEORY
);
request
.
setApplicableCourse
(
"污水处理一级"
);
request
.
setVocationalLevel
(
"初级工"
);
request
.
setPreparationDate
(
new
Date
());
request
.
setTeachingDate
(
new
Date
());
request
.
setClassHours
(
2
);
request
.
setTeachingObjectives
(
"掌握高处作业基本安全要求"
);
request
.
setTeachingContent
(
"安全防护用品使用和风险识别"
);
request
.
setChapterTopic
(
"第一章 高处作业安全"
);
request
.
setDurationMinutes
(
90
);
request
.
setClassName
(
"污水处理一级一班"
);
request
.
setTeachingPurpose
(
"掌握高处作业基本安全要求"
);
request
.
setKeyPoints
(
"正确使用安全带"
);
request
.
setDifficultPoints
(
"复杂环境风险识别"
);
request
.
setTeachingMethods
(
"讲授、演示与案例讨论"
);
request
.
setTeachingProcess
(
"导入、讲授、演示、练习和总结"
);
request
.
setAfterClassSummary
(
"课堂目标已完成"
);
request
.
setTeachingAids
(
"安全带实物与事故案例视频"
);
request
.
setTeachingNote
(
"课堂目标已完成"
);
request
.
setSignature
(
"王老师"
);
request
.
setSteps
(
Collections
.
emptyList
());
return
request
;
}
}
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