瀏覽代碼

监考明细和详情加入班级字段

wangliang 1 年之前
父節點
當前提交
549c421f59

+ 2 - 2
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamStudentController.java

@@ -147,7 +147,7 @@ public class TEExamStudentController {
                          @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode,
                          @ApiParam(value = "年级", required = false) @RequestParam(required = false) String grade,
                          @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable,
-                         @ApiParam(value = "教学班级", required = false) @RequestParam(required = false) String classNo,
+                         @ApiParam(value = "班级", required = false) @RequestParam(required = false) String classNo,
                          @ApiParam(value = "底照是否上传", required = false) @RequestParam(required = false) Integer hasPhoto)
             throws Exception {
         TBTaskHistory tbTaskHistory = null;
@@ -192,7 +192,7 @@ public class TEExamStudentController {
                         @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode,
                         @ApiParam(value = "年级", required = false) @RequestParam(required = false) String grade,
                         @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable,
-                        @ApiParam(value = "教学班级", required = false) @RequestParam(required = false) String classNo,
+                        @ApiParam(value = "班级", required = false) @RequestParam(required = false) String classNo,
                         @ApiParam(value = "底照是否上传", required = false) @RequestParam(required = false) Integer hasPhoto,
                         @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) int pageNumber,
                         @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) int pageSize) {

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/dto/ExamStudentImportDto.java

@@ -34,8 +34,8 @@ public class ExamStudentImportDto implements Serializable {
     @ExcelNote(value = "年级")
     private String grade; //年级
 
-    @ExcelNote(value = "教学班级")
-    private String classNo; //教学班级
+    @ExcelNote(value = "班级")
+    private String classNo; //班级
 
     @ExcelNote(value = "密码")
     private String password; //密码

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/dto/MarkResultSimpleExportDto.java

@@ -42,7 +42,7 @@ public class MarkResultSimpleExportDto implements Serializable {
     @ExcelNote(value = "年级")
     private String grade;
 
-    @ExcelNote(value = "教学班级")
+    @ExcelNote(value = "班级")
     private String classNo;
 
     @ExcelNote(value = "是否缺考")

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/dto/MarkResultStandardExportDto.java

@@ -45,7 +45,7 @@ public class MarkResultStandardExportDto implements Serializable {
     @ExcelNote(value = "年级")
     private String grade;
 
-    @ExcelNote(value = "教学班级")
+    @ExcelNote(value = "班级")
     private String classNo;
 
     @ExcelNote(value = "是否缺考")

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/dto/response/MarkResultDto.java

@@ -40,7 +40,7 @@ public class MarkResultDto implements Serializable {
     @ApiModelProperty(value = "年级")
     private String grade;
 
-    @ApiModelProperty(value = "教学班级")
+    @ApiModelProperty(value = "班级")
     private String classNo;
 
     @ApiModelProperty(value = "缺考")

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamStudentDto.java

@@ -56,9 +56,9 @@ public class TEExamStudentDto implements Serializable {
     @ApiModelProperty(name = "年级")
     private String grade;//年级
 
-    @ExcelNote(value = "教学班级")
-    @ApiModelProperty(name = "教学班级")
-    private String classNo;//教学班级
+    @ExcelNote(value = "班级")
+    @ApiModelProperty(name = "班级")
+    private String classNo;//班级
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(name = "考生id")

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/entity/TEExamStudent.java

@@ -84,7 +84,7 @@ public class TEExamStudent extends BaseEntity {
     @TableField(value = "grade", updateStrategy = FieldStrategy.IGNORED)
     private String grade;
 
-    @ApiModelProperty(value = "教学班级")
+    @ApiModelProperty(value = "班级")
     @TableField(value = "class_no", updateStrategy = FieldStrategy.IGNORED)
     private String classNo;