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
66392f2e
Commit
66392f2e
authored
Sep 15, 2026
by
wujipeng
Browse files
bug修复
parent
4e10634c
Changes
46
Show whitespace changes
Inline
Side-by-side
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/ExamAdminSaveDTO.java
View file @
66392f2e
...
@@ -11,8 +11,8 @@ import java.util.List;
...
@@ -11,8 +11,8 @@ import java.util.List;
/**
/**
* 管理员新增考试计划请求。
* 管理员新增考试计划请求。
*
*
* <p>理论考试
的总分由服务端
从理论试卷复制
;
实训考试
不绑定本系统试卷,因此必须由
* <p>理论考试从理论试卷复制
总分,
实训考试
从已发布实操规则复制总分。客户端不再拥有
*
管理员直接填写总分。两个字段由考试类型互斥使用,避免一场考试同时出现两套分值来源
。</p>
*
任何手工指定考试总分的入口,确保考试快照与所选试卷或规则一致
。</p>
*/
*/
@Data
@Data
public
class
ExamAdminSaveDTO
{
public
class
ExamAdminSaveDTO
{
...
@@ -36,11 +36,20 @@ public class ExamAdminSaveDTO {
...
@@ -36,11 +36,20 @@ public class ExamAdminSaveDTO {
private
String
chiefExaminerId
;
private
String
chiefExaminerId
;
/** 多选首席考评员;非null时优先于兼容单值字段。 */
private
List
<
String
>
chiefExaminerIds
;
private
String
invigilatorId
;
private
String
invigilatorId
;
/** 多选监考教师;非null时优先于兼容单值字段。 */
private
List
<
String
>
invigilatorIds
;
private
String
paperId
;
private
String
paperId
;
/** 仅实训考试必填;理论考试不允许提交,由服务端从试卷生成总分快照。 */
/** 仅实训考试必填,必须指向同等级的已发布规则。 */
private
Integer
practiceRuleId
;
/** 已废弃兼容字段;两种考试均不允许提交,服务端发现非null值会拒绝请求。 */
private
BigDecimal
totalScore
;
private
BigDecimal
totalScore
;
private
String
location
;
private
String
location
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/ExamAdminUpdateDTO.java
View file @
66392f2e
...
@@ -6,12 +6,13 @@ import lombok.Data;
...
@@ -6,12 +6,13 @@ import lombok.Data;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
/**
/**
* 管理员编辑考试计划请求。
* 管理员编辑考试计划请求。
*
*
* <p>
试卷、监考教师
、禁止交卷时间
和
应考学员
不在原型编辑弹窗中,因此本请求有意不暴露
* <p>
未开考且无人作答时允许调整两组教师和实训规则;理论试卷
、禁止交卷时间
与
应考学员
*
这些字段
,防止普通编辑
意外
重建已经确定的
考试
关系。</p>
*
仍保持创建时配置
,防止普通编辑重建已经确定的
作答
关系。</p>
*/
*/
@Data
@Data
public
class
ExamAdminUpdateDTO
{
public
class
ExamAdminUpdateDTO
{
...
@@ -28,6 +29,15 @@ public class ExamAdminUpdateDTO {
...
@@ -28,6 +29,15 @@ public class ExamAdminUpdateDTO {
private
String
chiefExaminerId
;
private
String
chiefExaminerId
;
private
List
<
String
>
chiefExaminerIds
;
private
String
invigilatorId
;
private
List
<
String
>
invigilatorIds
;
/** 实训考试可在尚未开考且无人作答时切换到另一条已发布规则。 */
private
Integer
practiceRuleId
;
private
String
location
;
private
String
location
;
private
BigDecimal
passScore
;
private
BigDecimal
passScore
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/PracticePaperRuleItemDTO.java
View file @
66392f2e
...
@@ -9,8 +9,8 @@ import java.math.BigDecimal;
...
@@ -9,8 +9,8 @@ import java.math.BigDecimal;
@Data
@Data
public
class
PracticePaperRuleItemDTO
{
public
class
PracticePaperRuleItemDTO
{
@ApiModelProperty
(
"
规则
ID;项目和单元内容由该ID对应的
标准类目
确定"
)
@ApiModelProperty
(
"
标准类目
ID;项目和单元内容由该ID对应的
目录项
确定"
)
private
Integer
i
d
;
private
Integer
catalogI
d
;
@ApiModelProperty
(
"单题考核时间,单位:分钟"
)
@ApiModelProperty
(
"单题考核时间,单位:分钟"
)
private
Integer
assessmentDuration
;
private
Integer
assessmentDuration
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/PracticePaperRuleQueryDTO.java
0 → 100644
View file @
66392f2e
package
com.platform.business.model.dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/** 管理员端实操试卷规则分页筛选条件。 */
@Data
public
class
PracticePaperRuleQueryDTO
{
private
Integer
pageNum
;
private
Integer
pageSize
;
@ApiModelProperty
(
"规则名称关键字"
)
private
String
name
;
@ApiModelProperty
(
"标准等级:一级至五级"
)
private
String
lev
;
@ApiModelProperty
(
"状态:DRAFT/PUBLISHED"
)
private
String
status
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/PracticePaperRuleSaveDTO.java
View file @
66392f2e
...
@@ -5,11 +5,14 @@ import lombok.Data;
...
@@ -5,11 +5,14 @@ import lombok.Data;
import
java.util.List
;
import
java.util.List
;
/** 管理员
按等级保存整套实操自动组卷配置
的请求体。 */
/** 管理员
创建或编辑一套具名实操组卷规则
的请求体。 */
@Data
@Data
public
class
PracticePaperRuleSaveDTO
{
public
class
PracticePaperRuleSaveDTO
{
@ApiModelProperty
(
"职级;支持一级或污水一级/污泥一级等以标准等级结尾的名称"
)
@ApiModelProperty
(
"规则名称;同一标准等级内不能重复"
)
private
String
name
;
@ApiModelProperty
(
"使用职级;支持一级或污水一级/污泥一级等以标准等级结尾的名称"
)
private
String
lev
;
private
String
lev
;
@ApiModelProperty
(
"该等级完整规则列表,类目必须与服务端Excel标准类目完全对应"
)
@ApiModelProperty
(
"该等级完整规则列表,类目必须与服务端Excel标准类目完全对应"
)
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/dto/PracticePaperRuleStatusDTO.java
0 → 100644
View file @
66392f2e
package
com.platform.business.model.dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/** 实操试卷规则发布请求。 */
@Data
public
class
PracticePaperRuleStatusDTO
{
@ApiModelProperty
(
"目标状态;当前仅支持PUBLISHED"
)
private
String
status
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/ExamEntity.java
View file @
66392f2e
...
@@ -55,6 +55,10 @@ public class ExamEntity {
...
@@ -55,6 +55,10 @@ public class ExamEntity {
@TableField
(
"paper_id"
)
@TableField
(
"paper_id"
)
private
String
paperId
;
private
String
paperId
;
@ApiModelProperty
(
value
=
"实训试卷规则ID"
)
@TableField
(
"practice_rule_id"
)
private
Integer
practiceRuleId
;
@ApiModelProperty
(
value
=
"试卷名称"
)
@ApiModelProperty
(
value
=
"试卷名称"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
paperName
;
private
String
paperName
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/ExamTeacherAssignmentEntity.java
0 → 100644
View file @
66392f2e
package
com.platform.business.model.entity
;
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
;
/** 考试教师角色关系;同一教师可同时拥有首席考评员和监考教师两种角色。 */
@Data
@TableName
(
"exam_teacher_assignment"
)
public
class
ExamTeacherAssignmentEntity
{
@TableId
(
type
=
IdType
.
AUTO
)
private
Integer
id
;
@TableField
(
"exam_id"
)
private
Integer
examId
;
@TableField
(
"teacher_id"
)
private
String
teacherId
;
private
String
role
;
@TableField
(
"display_order"
)
private
Integer
displayOrder
;
/** 查询时关联得到的教师展示名称,不写入关系表。 */
@TableField
(
exist
=
false
)
private
String
teacherName
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/PracticePaperRuleDefinitionEntity.java
0 → 100644
View file @
66392f2e
package
com.platform.business.model.entity
;
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.math.BigDecimal
;
import
java.util.Date
;
/** 实操试卷规则主表实体;明细类目保存在独立明细表中。 */
@Data
@TableName
(
"practice_paper_rule_definition"
)
public
class
PracticePaperRuleDefinitionEntity
{
@TableId
(
type
=
IdType
.
AUTO
)
private
Integer
id
;
private
String
name
;
@TableField
(
"level_grade"
)
private
String
levelGrade
;
@TableField
(
"question_count"
)
private
Integer
questionCount
;
@TableField
(
"total_duration"
)
private
Integer
totalDuration
;
@TableField
(
"total_score"
)
private
BigDecimal
totalScore
;
private
String
status
;
@TableField
(
"created_by"
)
private
String
createdBy
;
@TableField
(
"created_time"
)
private
Date
createdTime
;
@TableField
(
"updated_by"
)
private
String
updatedBy
;
@TableField
(
"updated_time"
)
private
Date
updatedTime
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/PracticePaperRuleDetailEntity.java
0 → 100644
View file @
66392f2e
package
com.platform.business.model.entity
;
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.math.BigDecimal
;
/** 一套实操试卷规则中的标准类目配分明细。 */
@Data
@TableName
(
"practice_paper_rule_detail"
)
public
class
PracticePaperRuleDetailEntity
{
@TableId
(
type
=
IdType
.
AUTO
)
private
Integer
id
;
@TableField
(
"rule_id"
)
private
Integer
ruleId
;
@TableField
(
"catalog_id"
)
private
Integer
catalogId
;
@TableField
(
"assessment_duration"
)
private
Integer
assessmentDuration
;
private
BigDecimal
score
;
@TableField
(
"question_count"
)
private
Integer
questionCount
;
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/entity/PracticePaperRuleEntity.java
View file @
66392f2e
...
@@ -11,11 +11,10 @@ import java.math.BigDecimal;
...
@@ -11,11 +11,10 @@ import java.math.BigDecimal;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
* 实操
自动组卷规则持久化
实体。
* 实操
组卷标准类目目录
实体。
*
*
* <p>这里保存的是“按等级选择哪些考核类目,以及每个类目的时间、配分和题量”,
* <p>项目名称与单元内容来自业务确认的Excel,不允许通过规则CRUD修改。数值字段仅作为
* 不保存也不生成正式试卷。项目名称与单元内容来自业务确认的 Excel 类目,管理员
* 新建规则表单的默认值;真正可发布的配置保存在definition/detail两张表中。</p>
* 只能调整三个数值字段,避免前端任意新增或篡改标准类目。</p>
*/
*/
@Data
@Data
@TableName
(
"practice_paper_rule"
)
@TableName
(
"practice_paper_rule"
)
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/ExamAdminDetailVO.java
View file @
66392f2e
...
@@ -37,14 +37,26 @@ public class ExamAdminDetailVO {
...
@@ -37,14 +37,26 @@ public class ExamAdminDetailVO {
private
String
chiefExaminerName
;
private
String
chiefExaminerName
;
private
List
<
String
>
chiefExaminerIds
;
private
List
<
ClassAdminOptionVO
>
chiefExaminers
;
private
String
invigilatorId
;
private
String
invigilatorId
;
private
String
invigilatorName
;
private
String
invigilatorName
;
private
List
<
String
>
invigilatorIds
;
private
List
<
ClassAdminOptionVO
>
invigilators
;
private
String
paperId
;
private
String
paperId
;
private
String
paperName
;
private
String
paperName
;
private
Integer
practiceRuleId
;
private
String
practiceRuleName
;
private
String
location
;
private
String
location
;
/** UPCOMING、ONGOING或ENDED,由服务端实时派生。 */
/** UPCOMING、ONGOING或ENDED,由服务端实时派生。 */
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/ExamAdminOptionsVO.java
View file @
66392f2e
...
@@ -14,5 +14,8 @@ public class ExamAdminOptionsVO {
...
@@ -14,5 +14,8 @@ public class ExamAdminOptionsVO {
/** 仅返回与当前班级职业等级一致的试卷。 */
/** 仅返回与当前班级职业等级一致的试卷。 */
private
List
<
ClassAdminOptionVO
>
papers
;
private
List
<
ClassAdminOptionVO
>
papers
;
/** 与班级等级匹配且状态为已发布的实操规则。 */
private
List
<
ClassAdminOptionVO
>
practiceRules
;
private
List
<
ExamAdminStudentOptionVO
>
students
;
private
List
<
ExamAdminStudentOptionVO
>
students
;
}
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/ExamStudentVO.java
View file @
66392f2e
...
@@ -81,12 +81,11 @@ public class ExamStudentVO extends ExamStudentEntity {
...
@@ -81,12 +81,11 @@ public class ExamStudentVO extends ExamStudentEntity {
private
String
invigilationId
;
private
String
invigilationId
;
/**
/**
*
当前最新
的实操组卷及配分规则。
*
本场考试选择
的实操组卷及配分规则。
*
*
* <p>recent接口本身只查询最近的实训考试,因此这里不做考试快照;管理员修改规则后,
* <p>规则发布后不可编辑,考试按规则ID读取稳定明细;总分仍以exam表快照为准。</p>
* 后续调用会立即返回最新配置,供仿真实操系统按当前标准组织本场考核。</p>
*/
*/
@ApiModelProperty
(
value
=
"
当前最新
实操组卷及配分规则"
)
@ApiModelProperty
(
value
=
"
本场考试选择的
实操组卷及配分规则"
)
private
PracticePaperRuleConfigurationVO
practiceRule
;
private
PracticePaperRuleConfigurationVO
practiceRule
;
private
List
<
ExamStudentVO
>
data
;
private
List
<
ExamStudentVO
>
data
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/PracticePaperRuleConfigurationVO.java
View file @
66392f2e
...
@@ -4,18 +4,29 @@ import io.swagger.annotations.ApiModelProperty;
...
@@ -4,18 +4,29 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
/** 一套按标准等级归一化后的实操自动组卷配置。 */
/** 一套按标准等级归一化后的实操自动组卷配置。 */
@Data
@Data
public
class
PracticePaperRuleConfigurationVO
{
public
class
PracticePaperRuleConfigurationVO
{
private
Integer
id
;
@ApiModelProperty
(
"规则名称"
)
private
String
name
;
@ApiModelProperty
(
"请求使用的原始职级名称"
)
@ApiModelProperty
(
"请求使用的原始职级名称"
)
private
String
lev
;
private
String
lev
;
@ApiModelProperty
(
"用于匹配Excel类目的标准等级"
)
@ApiModelProperty
(
"用于匹配Excel类目的标准等级"
)
private
String
grade
;
private
String
grade
;
@ApiModelProperty
(
"状态:DRAFT/PUBLISHED"
)
private
String
status
;
private
String
statusLabel
;
@ApiModelProperty
(
"考核总题数,必须在1到5题之间"
)
@ApiModelProperty
(
"考核总题数,必须在1到5题之间"
)
private
Integer
totalQuestionCount
;
private
Integer
totalQuestionCount
;
...
@@ -25,6 +36,19 @@ public class PracticePaperRuleConfigurationVO {
...
@@ -25,6 +36,19 @@ public class PracticePaperRuleConfigurationVO {
@ApiModelProperty
(
"配分合计"
)
@ApiModelProperty
(
"配分合计"
)
private
BigDecimal
totalScore
;
private
BigDecimal
totalScore
;
@ApiModelProperty
(
"被考试引用的数量"
)
private
Integer
usageCount
;
private
Boolean
publishable
;
private
Boolean
editable
;
private
Boolean
deletable
;
private
Date
createdTime
;
private
Date
updatedTime
;
@ApiModelProperty
(
"实操类目及其当前配分规则"
)
@ApiModelProperty
(
"实操类目及其当前配分规则"
)
private
List
<
PracticePaperRuleItemVO
>
ruleList
;
private
List
<
PracticePaperRuleItemVO
>
ruleList
;
}
}
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/PracticePaperRuleItemVO.java
View file @
66392f2e
...
@@ -11,6 +11,9 @@ public class PracticePaperRuleItemVO {
...
@@ -11,6 +11,9 @@ public class PracticePaperRuleItemVO {
private
Integer
id
;
private
Integer
id
;
@ApiModelProperty
(
"标准类目ID"
)
private
Integer
catalogId
;
@ApiModelProperty
(
"项目名称"
)
@ApiModelProperty
(
"项目名称"
)
private
String
projectName
;
private
String
projectName
;
...
...
practical-api/practical-business-api/src/main/java/com/platform/business/model/vo/RecentExamStudentVO.java
View file @
66392f2e
...
@@ -39,6 +39,9 @@ public class RecentExamStudentVO {
...
@@ -39,6 +39,9 @@ public class RecentExamStudentVO {
@ApiModelProperty
(
value
=
"考试id"
)
@ApiModelProperty
(
value
=
"考试id"
)
private
int
examId
;
private
int
examId
;
@ApiModelProperty
(
value
=
"实训试卷规则ID"
)
private
Integer
practiceRuleId
;
@ApiModelProperty
(
value
=
"考试名称"
)
@ApiModelProperty
(
value
=
"考试名称"
)
private
String
examName
;
private
String
examName
;
...
@@ -70,12 +73,12 @@ public class RecentExamStudentVO {
...
@@ -70,12 +73,12 @@ public class RecentExamStudentVO {
private
String
invigilationId
;
private
String
invigilationId
;
/**
/**
*
当前最新
的实操组卷及配分规则扩展字段。
*
考试创建时选择
的实操组卷及配分规则扩展字段。
*
*
* <p>
该字段是现有项目在基础接口契约上的扩展。为保持调用方兼容,无论最近考试的
* <p>
仅实训考试返回,按practiceRuleId读取发布后不可变的规则,避免学生职级变化或
*
实际类型为何,字段结构均会保留,并按学生等级读取最新实操配置
。</p>
*
管理员新增规则后改变既有考试内容
。</p>
*/
*/
@ApiModelProperty
(
value
=
"
当前最新
实操组卷及配分规则"
)
@ApiModelProperty
(
value
=
"
本场考试选择的
实操组卷及配分规则"
)
private
PracticePaperRuleConfigurationVO
practiceRule
;
private
PracticePaperRuleConfigurationVO
practiceRule
;
/** 同一场考试的全部学员;列表项保留原接口使用的精简学员结构。 */
/** 同一场考试的全部学员;列表项保留原接口使用的精简学员结构。 */
...
...
practical-business/src/main/java/com/platform/business/controller/TeacherScoreController.java
View file @
66392f2e
...
@@ -28,7 +28,8 @@ import java.util.List;
...
@@ -28,7 +28,8 @@ import java.util.List;
* 教师端“智能考评-成绩管理”接口。
* 教师端“智能考评-成绩管理”接口。
*
*
* <p>所有入口都从 Authorization 解析当前教师,不提供 teacherId 请求参数;考试归属
* <p>所有入口都从 Authorization 解析当前教师,不提供 teacherId 请求参数;考试归属
* 还会在 Mapper 层按 chief_id 再次过滤,确保教师只能读取本人主考的待批阅或正式成绩。</p>
* 还会在 Mapper 层按首席考评员关系再次过滤,确保教师只能读取本人主考的待批阅或正式
* 成绩,旧 chief_id 仅用于未迁移历史数据的兼容。</p>
*/
*/
@Api
(
tags
=
"教师端-成绩管理"
)
@Api
(
tags
=
"教师端-成绩管理"
)
@RestController
@RestController
...
...
practical-business/src/main/java/com/platform/business/controller/TheoreticalPaperAdminController.java
View file @
66392f2e
...
@@ -2,6 +2,8 @@ package com.platform.business.controller;
...
@@ -2,6 +2,8 @@ package com.platform.business.controller;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.platform.business.model.dto.PracticePaperRuleSaveDTO
;
import
com.platform.business.model.dto.PracticePaperRuleSaveDTO
;
import
com.platform.business.model.dto.PracticePaperRuleQueryDTO
;
import
com.platform.business.model.dto.PracticePaperRuleStatusDTO
;
import
com.platform.business.model.dto.TheoreticalPaperAutoSaveDTO
;
import
com.platform.business.model.dto.TheoreticalPaperAutoSaveDTO
;
import
com.platform.business.model.dto.TheoreticalPaperDTO
;
import
com.platform.business.model.dto.TheoreticalPaperDTO
;
import
com.platform.business.model.dto.TheoreticalPaperManualSaveDTO
;
import
com.platform.business.model.dto.TheoreticalPaperManualSaveDTO
;
...
@@ -9,6 +11,7 @@ import com.platform.business.model.dto.TheoreticalPaperStatusDTO;
...
@@ -9,6 +11,7 @@ import com.platform.business.model.dto.TheoreticalPaperStatusDTO;
import
com.platform.business.model.entity.UserEntity
;
import
com.platform.business.model.entity.UserEntity
;
import
com.platform.business.model.vo.CombinationVO
;
import
com.platform.business.model.vo.CombinationVO
;
import
com.platform.business.model.vo.PracticePaperRuleConfigurationVO
;
import
com.platform.business.model.vo.PracticePaperRuleConfigurationVO
;
import
com.platform.business.model.vo.PracticePaperRuleItemVO
;
import
com.platform.business.model.vo.TheoreticalPaperVO
;
import
com.platform.business.model.vo.TheoreticalPaperVO
;
import
com.platform.business.service.AuthenticatedUserService
;
import
com.platform.business.service.AuthenticatedUserService
;
import
com.platform.business.service.PracticePaperRuleService
;
import
com.platform.business.service.PracticePaperRuleService
;
...
@@ -33,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -33,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
/**
* 管理员端“智能考评-理论试卷管理”接口。
* 管理员端“智能考评-理论试卷管理”接口。
...
@@ -86,20 +90,74 @@ public class TheoreticalPaperAdminController extends BaseController {
...
@@ -86,20 +90,74 @@ public class TheoreticalPaperAdminController extends BaseController {
return
Result
.
data
(
paperAdminService
.
autoConfiguration
(
level
));
return
Result
.
data
(
paperAdminService
.
autoConfiguration
(
level
));
}
}
@ApiOperation
(
"
查询实操自动组卷规则;仅返回规则配置,不生成正式试卷
"
)
@ApiOperation
(
"
实操试卷规则分页,支持名称、职级和状态筛选
"
)
@
Ge
tMapping
(
"/practice/
auto-configuration
"
)
@
Pos
tMapping
(
"/practice/
page
"
)
public
Result
<
PracticePaperRuleConfigurationVO
>
practiceAutoConfiguration
(
public
TableDataInfo
practicePage
(
@RequestBody
(
required
=
false
)
PracticePaperRuleQueryDTO
query
,
@RequestParam
(
"lev"
)
String
level
,
HttpServletRequest
request
)
{
HttpServletRequest
request
)
{
currentAdmin
(
request
);
currentAdmin
(
request
);
return
Result
.
data
(
practicePaperRuleService
.
configuration
(
level
));
PracticePaperRuleQueryDTO
safe
=
query
==
null
?
new
PracticePaperRuleQueryDTO
()
:
query
;
int
pageNum
=
safe
.
getPageNum
()
==
null
||
safe
.
getPageNum
()
<
1
?
1
:
safe
.
getPageNum
();
int
pageSize
=
safe
.
getPageSize
()
==
null
||
safe
.
getPageSize
()
<
1
?
10
:
Math
.
min
(
safe
.
getPageSize
(),
100
);
safe
.
setPageNum
(
pageNum
);
safe
.
setPageSize
(
pageSize
);
startPage
(
pageNum
,
pageSize
);
try
{
return
getDataTable
(
practicePaperRuleService
.
queryPage
(
safe
));
}
finally
{
PageHelper
.
clearPage
();
}
}
}
@ApiOperation
(
"
保存实操自动组卷规则;所有类目考核题量合计最多5题
"
)
@ApiOperation
(
"
创建实操试卷规则草稿
"
)
@P
u
tMapping
(
"/practice
/auto-configuration
"
)
@P
os
tMapping
(
"/practice"
)
public
Result
<
PracticePaperRuleConfigurationVO
>
sav
ePractice
AutoConfiguration
(
public
Result
<
PracticePaperRuleConfigurationVO
>
creat
ePractice
Rule
(
@RequestBody
PracticePaperRuleSaveDTO
body
,
HttpServletRequest
request
)
{
@RequestBody
PracticePaperRuleSaveDTO
body
,
HttpServletRequest
request
)
{
UserEntity
administrator
=
currentAdmin
(
request
);
UserEntity
administrator
=
currentAdmin
(
request
);
return
Result
.
data
(
practicePaperRuleService
.
saveConfiguration
(
body
,
administrator
.
getId
()));
return
Result
.
data
(
practicePaperRuleService
.
create
(
body
,
administrator
.
getId
()));
}
@ApiOperation
(
"查询指定职级的实操标准类目目录"
)
@GetMapping
(
"/practice/catalog"
)
public
Result
<
List
<
PracticePaperRuleItemVO
>>
practiceCatalog
(
@RequestParam
(
"lev"
)
String
level
,
HttpServletRequest
request
)
{
currentAdmin
(
request
);
return
Result
.
data
(
practicePaperRuleService
.
catalog
(
level
));
}
@ApiOperation
(
"实操试卷规则详情"
)
@GetMapping
(
"/practice/{ruleId}"
)
public
Result
<
PracticePaperRuleConfigurationVO
>
practiceRuleDetail
(
@PathVariable
Integer
ruleId
,
HttpServletRequest
request
)
{
currentAdmin
(
request
);
return
Result
.
data
(
practicePaperRuleService
.
detail
(
ruleId
));
}
@ApiOperation
(
"编辑实操试卷规则草稿"
)
@PutMapping
(
"/practice/{ruleId}"
)
public
Result
<
PracticePaperRuleConfigurationVO
>
updatePracticeRule
(
@PathVariable
Integer
ruleId
,
@RequestBody
PracticePaperRuleSaveDTO
body
,
HttpServletRequest
request
)
{
UserEntity
administrator
=
currentAdmin
(
request
);
return
Result
.
data
(
practicePaperRuleService
.
update
(
ruleId
,
body
,
administrator
.
getId
()));
}
@ApiOperation
(
"发布实操试卷规则"
)
@PutMapping
(
"/practice/{ruleId}/status"
)
public
Result
<
PracticePaperRuleConfigurationVO
>
publishPracticeRule
(
@PathVariable
Integer
ruleId
,
@RequestBody
PracticePaperRuleStatusDTO
body
,
HttpServletRequest
request
)
{
UserEntity
administrator
=
currentAdmin
(
request
);
return
Result
.
data
(
practicePaperRuleService
.
publish
(
ruleId
,
body
==
null
?
null
:
body
.
getStatus
(),
administrator
.
getId
()));
}
@ApiOperation
(
"删除未被考试使用的实操试卷规则"
)
@DeleteMapping
(
"/practice/{ruleId}"
)
public
Result
<
Boolean
>
deletePracticeRule
(
@PathVariable
Integer
ruleId
,
HttpServletRequest
request
)
{
currentAdmin
(
request
);
return
Result
.
data
(
practicePaperRuleService
.
delete
(
ruleId
));
}
}
@ApiOperation
(
"按数据库组卷规则自动创建试卷"
)
@ApiOperation
(
"按数据库组卷规则自动创建试卷"
)
...
...
practical-business/src/main/java/com/platform/business/mapper/ExamMapper.java
View file @
66392f2e
...
@@ -69,6 +69,8 @@ public interface ExamMapper extends BaseMapper<ExamEntity> {
...
@@ -69,6 +69,8 @@ public interface ExamMapper extends BaseMapper<ExamEntity> {
int
countAdminExamActiveTeacher
(
@Param
(
"teacherId"
)
String
teacherId
);
int
countAdminExamActiveTeacher
(
@Param
(
"teacherId"
)
String
teacherId
);
List
<
String
>
selectAdminExamActiveTeacherIds
(
@Param
(
"teacherIds"
)
List
<
String
>
teacherIds
);
int
countAdminExamDuplicateName
(
@Param
(
"classId"
)
Integer
classId
,
int
countAdminExamDuplicateName
(
@Param
(
"classId"
)
Integer
classId
,
@Param
(
"name"
)
String
name
,
@Param
(
"name"
)
String
name
,
@Param
(
"excludeId"
)
Integer
excludeId
);
@Param
(
"excludeId"
)
Integer
excludeId
);
...
@@ -79,8 +81,7 @@ public interface ExamMapper extends BaseMapper<ExamEntity> {
...
@@ -79,8 +81,7 @@ public interface ExamMapper extends BaseMapper<ExamEntity> {
List
<
ExamAdminDetailVO
>
selectAdminExamConflicts
(
@Param
(
"startTime"
)
Date
startTime
,
List
<
ExamAdminDetailVO
>
selectAdminExamConflicts
(
@Param
(
"startTime"
)
Date
startTime
,
@Param
(
"duration"
)
Integer
duration
,
@Param
(
"duration"
)
Integer
duration
,
@Param
(
"classId"
)
Integer
classId
,
@Param
(
"classId"
)
Integer
classId
,
@Param
(
"chiefId"
)
String
chiefId
,
@Param
(
"teacherIds"
)
List
<
String
>
teacherIds
,
@Param
(
"invigilatorId"
)
String
invigilatorId
,
@Param
(
"studentIds"
)
List
<
String
>
studentIds
,
@Param
(
"studentIds"
)
List
<
String
>
studentIds
,
@Param
(
"excludeId"
)
Integer
excludeId
);
@Param
(
"excludeId"
)
Integer
excludeId
);
...
...
Prev
1
2
3
Next
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