From aba3763aa79d15f63d842b688c7875a5d8eeed01 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Tue, 20 Jan 2026 09:12:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E8=82=B2=E8=B5=84=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/VideoCoursewareAddExe.java | 3 +++ .../clientobject/resource/ExamPaperCO.java | 2 +- .../dto/clientobject/resource/QuestionCO.java | 3 +-- .../dto/clientobject/resource/TeacherCO.java | 16 +++++++++++++--- .../resource/TeacherCertificateCO.java | 6 +++--- .../resource/VideoCoursewareCO.java | 13 +++++++++++++ .../edu/dto/resource/ExamPaperPageQry.java | 6 ++++-- .../edu/dto/resource/QuestionAddCmd.java | 2 +- .../edu/dto/resource/QuestionUpdateCmd.java | 2 +- .../resource/TeacherCertificateAddCmd.java | 6 +++--- .../resource/TeacherCertificateUpdateCmd.java | 7 +------ .../edu/dto/resource/TeacherUpdateCmd.java | 19 ++----------------- .../dto/resource/VideoCoursewareAddCmd.java | 7 ++++--- .../resource/VideoCoursewareUpdateCmd.java | 3 +++ .../edu/domain/enums/QuestionTypeEnum.java | 10 +++++----- .../edu/domain/enums/TeacherStateEnum.java | 19 +++++++++++++++++++ .../edu/domain/model/resource/ExamPaperE.java | 2 +- .../edu/domain/model/resource/QuestionE.java | 9 +++++---- .../edu/domain/model/resource/TeacherE.java | 8 +++++--- .../model/resource/VideoCoursewareE.java | 4 ++++ .../persistence/dataobject/ExamPaperDO.java | 2 +- .../persistence/dataobject/QuestionDO.java | 2 +- .../edu/persistence/dataobject/TeacherDO.java | 13 +++++++++++-- .../dataobject/VideoCoursewareDO.java | 6 ++++++ .../main/resources/mapper/TeacherMapper.xml | 5 ++++- .../mapper/VideoCoursewareMapper.xml | 11 ++++++----- 26 files changed, 121 insertions(+), 65 deletions(-) create mode 100644 web-domain/src/main/java/com/zcloud/edu/domain/enums/TeacherStateEnum.java diff --git a/web-app/src/main/java/com/zcloud/edu/command/resource/VideoCoursewareAddExe.java b/web-app/src/main/java/com/zcloud/edu/command/resource/VideoCoursewareAddExe.java index 740a6ce..361a275 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/resource/VideoCoursewareAddExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/resource/VideoCoursewareAddExe.java @@ -1,5 +1,6 @@ package com.zcloud.edu.command.resource; +import com.zcloud.edu.domain.enums.CommonFlagEnum; import com.zcloud.edu.domain.gateway.resource.VideoCoursewareGateway; import com.zcloud.edu.domain.model.resource.VideoCoursewareE; import com.zcloud.edu.dto.resource.VideoCoursewareAddCmd; @@ -27,8 +28,10 @@ public class VideoCoursewareAddExe { VideoCoursewareE videoCoursewareE = new VideoCoursewareE(); BeanUtils.copyProperties(cmd, videoCoursewareE); + boolean res = false; try { + videoCoursewareE.setState(CommonFlagEnum.NO.getCode()); res = videoCoursewareGateway.add(videoCoursewareE); } catch (Exception e) { throw new RuntimeException(e); diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/ExamPaperCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/ExamPaperCO.java index 34abbe3..4f3e15d 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/ExamPaperCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/ExamPaperCO.java @@ -37,7 +37,7 @@ public class ExamPaperCO { private Integer sellFlag; //考试时长（分钟） @ApiModelProperty(value = "考试时长（分钟）") - private String examTime; + private Integer examTime; //试卷类型 1-自建试卷 2-班级中自动生成试卷 @ApiModelProperty(value = "试卷类型 1-自建试卷 2-班级中自动生成试卷") private Integer type; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/QuestionCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/QuestionCO.java index 2878571..5c781fc 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/QuestionCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/QuestionCO.java @@ -33,8 +33,7 @@ public class QuestionCO extends ClientObject { // private Integer questionNumber; //试题类型（单选题、多选题、判断题、填空题） @ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）") - - private String questionType; + private Integer questionType; //题干 @ApiModelProperty(value = "题干") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCO.java index 90d40ea..af774a0 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCO.java @@ -1,11 +1,13 @@ package com.zcloud.edu.dto.clientobject.resource; import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -42,12 +44,13 @@ public class TeacherCO extends ClientObject { private String assessmentDepartment; //考核时间 @ApiModelProperty(value = "考核时间") - private LocalDateTime assessmentTime; +@JsonFormat(pattern = "yyyy-MM-dd") + private Date assessmentTime; //考核结果 @ApiModelProperty(value = "考核结果") private String assessmentResult; - //状态（0-禁用 1-启用）(老项目0启用,1禁用) - @ApiModelProperty(value = "状态（0-禁用 1-启用）(老项目0启用,1禁用)") + //状态（0启用,1禁用) + @ApiModelProperty(value = "状态（0启用,1禁用)") private Integer state; @ApiModelProperty(value = "创建时间") @@ -60,6 +63,13 @@ public class TeacherCO extends ClientObject { @ApiModelProperty(value = "单位名称") private String corpinfoName; + @ApiModelProperty(value = "身份证") + private String userIdCard; + @ApiModelProperty(value = "文化程度字典") + private String culturalLevel; + @ApiModelProperty(value = "文化程度子字典名称") + private String culturalLevelName; + @ApiModelProperty(value = "教师资格证书列表") private List teacherCertificateList; } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCertificateCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCertificateCO.java index 8884634..df08b51 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCertificateCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCertificateCO.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.time.LocalDate; +import java.util.Date; /** * web-client @@ -43,14 +44,13 @@ public class TeacherCertificateCO extends ClientObject { private Integer effectiveFlag; //证书有效期（开始） @ApiModelProperty(value = "证书有效期（开始）") - @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate certificateDateStart; + private Date certificateDateStart; //证书有效期（结束） @ApiModelProperty(value = "证书有效期（结束）") @JsonFormat(pattern = "yyyy-MM-dd") - private LocalDate certificateDateEnd; + private Date certificateDateEnd; //企业ID @ApiModelProperty(value = "企业ID") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/VideoCoursewareCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/VideoCoursewareCO.java index b018269..e416d2b 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/VideoCoursewareCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/VideoCoursewareCO.java @@ -1,10 +1,15 @@ package com.zcloud.edu.dto.clientobject.resource; import com.alibaba.cola.dto.ClientObject; +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; /** @@ -36,6 +41,8 @@ public class VideoCoursewareCO extends ClientObject { //课件文件路径 @ApiModelProperty(value = "课件文件路径") private String videoFiles; + @ApiModelProperty(value = "课件文件名称", name = "videoName") + private String videoName; //课件描述 @ApiModelProperty(value = "课件描述") private String coursewareIntroduce; @@ -64,5 +71,11 @@ public class VideoCoursewareCO extends ClientObject { private Integer corpType; @ApiModelProperty(value = "是否是当前用户创建的数据") private Boolean isUserCreate = false; + + @ApiModelProperty(value = "上传时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + @ApiModelProperty(value = "习题数") + private Integer questionCount; } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/ExamPaperPageQry.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/ExamPaperPageQry.java index f619a4a..900c0ba 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/ExamPaperPageQry.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/ExamPaperPageQry.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * web-client @@ -27,9 +29,9 @@ public class ExamPaperPageQry extends PageQuery { @ApiModelProperty(value = "试卷名称") private String examPaperName; @ApiModelProperty(value = "试卷总分数") - private String examScore; + private BigDecimal examScore; @ApiModelProperty(value = "及格分数") - private String passScore; + private BigDecimal passScore; @ApiModelProperty(value = "是否上架（0否 1是）") private Integer sellFlag; //上传开始时间 diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java index 2422c8c..d8515e3 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java @@ -30,7 +30,7 @@ public class QuestionAddCmd extends Command { @ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）", name = "questionType", required = true) @NotEmpty(message = "试题类型（单选题、多选题、判断题）不能为空") - private String questionType; + private Integer questionType; @ApiModelProperty(value = "题干", name = "questionDry", required = true) @NotEmpty(message = "题干不能为空") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java index 479b153..0093f3a 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java @@ -36,7 +36,7 @@ public class QuestionUpdateCmd extends Command { @ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）", name = "questionType", required = true) @NotEmpty(message = "试题类型（单选题、多选题、判断题）不能为空") - private String questionType; + private Integer questionType; @ApiModelProperty(value = "题干", name = "questionDry", required = true) @NotEmpty(message = "题干不能为空") diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateAddCmd.java index 5600fc5..dd10ff8 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateAddCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateAddCmd.java @@ -22,6 +22,9 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class TeacherCertificateAddCmd extends Command { + @ApiModelProperty(value = "业务主键id", name = "teacherCertificateId", required = true) + private String teacherCertificateId; + @ApiModelProperty(value = "教师ID", name = "teacherId", required = true) @NotEmpty(message = "教师ID不能为空") private String teacherId; @@ -51,9 +54,6 @@ public class TeacherCertificateAddCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private Date certificateDateEnd; - @ApiModelProperty(value = "证书照片", name = "certificateFilepath", required = true) - @NotEmpty(message = "证书照片不能为空") - private String certificateFilepath; @ApiModelProperty(value = "企业ID", name = "corpinfoId") private Long corpinfoId; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateUpdateCmd.java index 72f2b42..429ea07 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateUpdateCmd.java @@ -50,11 +50,6 @@ public class TeacherCertificateUpdateCmd extends Command { @ApiModelProperty(value = "证书有效期（结束）", name = "certificateDateEnd") @JsonFormat(pattern = "yyyy-MM-dd") private Date certificateDateEnd; - @ApiModelProperty(value = "证书照片", name = "certificateFilepath", required = true) - @NotEmpty(message = "证书照片不能为空") - private String certificateFilepath; - @ApiModelProperty(value = "企业ID", name = "corpinfoId", required = true) - @NotNull(message = "企业ID不能为空") - private Long corpinfoId; + } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherUpdateCmd.java index ca9bd05..fbf473c 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherUpdateCmd.java @@ -10,6 +10,8 @@ import lombok.NoArgsConstructor; import javax.validation.constraints.*; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; /** @@ -32,23 +34,6 @@ public class TeacherUpdateCmd extends Command { private String teacherId; - @ApiModelProperty(value = "教师姓名", name = "teacherName", required = true) - @NotEmpty(message = "教师姓名不能为空") - private String teacherName; - - - @ApiModelProperty(value = "身份证号", name = "identityNumber", required = true) - @NotEmpty(message = "身份证号不能为空") - private String identityNumber; - - @ApiModelProperty(value = "文化程度", name = "educationLevel", required = true) - @NotEmpty(message = "文化程度不能为空") - private String educationLevel; - - @ApiModelProperty(value = "文化程度名称", name = "educationLevelName", required = true) - @NotEmpty(message = "文化程度名称不能为空") - private String educationLevelName; - @ApiModelProperty(value = "专业", name = "profession", required = true) @NotEmpty(message = "专业不能为空") private String profession; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareAddCmd.java index 93a3051..a1177d4 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareAddCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareAddCmd.java @@ -41,13 +41,14 @@ public class VideoCoursewareAddCmd extends Command { @NotEmpty(message = "课件文件路径不能为空") private String videoFiles; + @ApiModelProperty(value = "课件文件名称", name = "videoName", required = true) + @NotEmpty(message = "课件文件名称不能为空") + private String videoName; + @ApiModelProperty(value = "课件描述", name = "coursewareIntroduce", required = true) @NotEmpty(message = "课件描述不能为空") private String coursewareIntroduce; - @ApiModelProperty(value = "课件状态 0未启用, 1-启用", name = "state", required = true) - private Integer state; - @ApiModelProperty(value = "课件时长(视频时间)-秒", name = "videoTime", required = true) @NotNull(message = "课件时长(视频时间)-秒不能为空") private BigDecimal videoTime; diff --git a/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java index d9518be..4725a32 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java @@ -41,6 +41,9 @@ public class VideoCoursewareUpdateCmd extends Command { @ApiModelProperty(value = "课件文件路径", name = "videoFiles", required = true) @NotEmpty(message = "课件文件路径不能为空") private String videoFiles; + @ApiModelProperty(value = "课件文件名称", name = "videoName", required = true) + @NotEmpty(message = "课件文件名称不能为空") + private String videoName; @ApiModelProperty(value = "课件描述", name = "coursewareIntroduce", required = true) @NotEmpty(message = "课件描述不能为空") private String coursewareIntroduce; diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionTypeEnum.java b/web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionTypeEnum.java index a7b873a..2de2702 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionTypeEnum.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionTypeEnum.java @@ -8,14 +8,14 @@ import lombok.Getter; @Getter public enum QuestionTypeEnum { - CHOICE("1","单选题"), - MULTIPLE("2","多选题"), - JUDGE("3","判断题"), + CHOICE(1,"单选题"), + MULTIPLE(2,"多选题"), + JUDGE(3,"判断题"), ; - private final String code; + private final Integer code; private final String name; - QuestionTypeEnum(String code, String name) { + QuestionTypeEnum(Integer code, String name) { this.code = code; this.name = name; } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/enums/TeacherStateEnum.java b/web-domain/src/main/java/com/zcloud/edu/domain/enums/TeacherStateEnum.java new file mode 100644 index 0000000..6f3243e --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/edu/domain/enums/TeacherStateEnum.java @@ -0,0 +1,19 @@ +package com.zcloud.edu.domain.enums; + +import lombok.Getter; +//状态（0启用,1禁用) +@Getter +public enum TeacherStateEnum { + //0启用,1禁用) + UNABLE(1,"禁用"), + ENABLE(0,"启用"), + + ; + private final Integer code; + private final String name; + + TeacherStateEnum(Integer code, String name) { + this.code = code; + this.name = name; + } +} diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/ExamPaperE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/ExamPaperE.java index 32bdf37..9348604 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/ExamPaperE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/ExamPaperE.java @@ -28,7 +28,7 @@ public class ExamPaperE extends BaseE { //是否上架（0否 1是） private Integer sellFlag; //考试时长（分钟） - private String examTime; + private Integer examTime; //试卷类型 1-自建试卷 2-班级中自动生成试卷 private Integer type; //删除标识true false diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java index 4cf7f05..89697f5 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java @@ -39,7 +39,7 @@ public class QuestionE extends BaseE { // //题号 // private Integer questionNumber; //试题类型（单选题、多选题、判断题、填空题） - private String questionType; + private Integer questionType; //题干 private String questionDry; //选项A @@ -77,17 +77,18 @@ public class QuestionE extends BaseE { throw new RuntimeException("请选择正确的课件类型"); } - if (questionE.getQuestionType().equals("1")) { + if (QuestionTypeEnum.CHOICE.getCode().equals(questionE.getQuestionType())) { // 单选题 if (questionE.getOptionA() == null || questionE.getOptionB() == null || questionE.getOptionC() == null || questionE.getOptionD() == null) { throw new RuntimeException("单选题选项不能为空"); } - } else if (questionE.getQuestionType().equals("2")) { + } else if (QuestionTypeEnum.MULTIPLE.getCode().equals(questionE.getQuestionType())) { // 多选题 if (questionE.getOptionA() == null || questionE.getOptionB() == null || questionE.getOptionC() == null || questionE.getOptionD() == null) { throw new RuntimeException("多选题选项不能为空"); } - } else if (questionE.getQuestionType().equals("3")) { + } else if (QuestionTypeEnum.JUDGE.getCode().equals(questionE.getQuestionType())) { + // 判断题 if (questionE.getOptionA() == null || questionE.getOptionB() == null) { throw new RuntimeException("判断题选项不能为空"); diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/TeacherE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/TeacherE.java index 69f4a28..1d5cffb 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/TeacherE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/TeacherE.java @@ -4,11 +4,13 @@ import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.domain.model.BaseE; import com.zcloud.edu.domain.enums.CommonFlagEnum; +import com.zcloud.edu.domain.enums.TeacherStateEnum; import com.zcloud.gbscommon.utils.UuidUtil; import lombok.Data; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -36,10 +38,10 @@ public class TeacherE extends BaseE { //考核部门 private String assessmentDepartment; //考核时间 - private LocalDateTime assessmentTime; + private Date assessmentTime; //考核结果 private String assessmentResult; - //状态（0-禁用 1-启用）(老项目0启用,1禁用) + //状态（0启用,1禁用) private Integer state; /** @@ -59,7 +61,7 @@ public class TeacherE extends BaseE { teacher.setCorpinfoId(userAddE.getCorpinfoId()); // 默认启用 - teacher.setState(CommonFlagEnum.YES.getCode()); + teacher.setState(TeacherStateEnum.ENABLE.getCode()); teacherList.add(teacher); } diff --git a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/VideoCoursewareE.java b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/VideoCoursewareE.java index fcfa720..fc39c16 100644 --- a/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/VideoCoursewareE.java +++ b/web-domain/src/main/java/com/zcloud/edu/domain/model/resource/VideoCoursewareE.java @@ -1,8 +1,10 @@ package com.zcloud.edu.domain.model.resource; import com.jjb.saas.framework.domain.model.BaseE; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; import java.math.BigDecimal; /** @@ -27,6 +29,8 @@ public class VideoCoursewareE extends BaseE { private String teacherId; //课件文件路径 private String videoFiles; + + private String videoName; //课件描述 private String coursewareIntroduce; //课件状态 0未启用, 1-启用 diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/ExamPaperDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/ExamPaperDO.java index 0e9b2b6..6cbc7dc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/ExamPaperDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/ExamPaperDO.java @@ -41,7 +41,7 @@ public class ExamPaperDO extends BaseDO { private Integer sellFlag; //考试时长（分钟） @ApiModelProperty(value = "考试时长（分钟）") - private String examTime; + private Integer examTime; //试卷类型 1-自建试卷 2-班级中自动生成试卷 @ApiModelProperty(value = "试卷类型 1-自建试卷 2-班级中自动生成试卷") diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/QuestionDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/QuestionDO.java index b76af9a..f06a6db 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/QuestionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/QuestionDO.java @@ -34,7 +34,7 @@ public class QuestionDO extends BaseDO { private Integer questionNumber;*/ //试题类型（单选题、多选题、判断题、填空题） @ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）") - private String questionType; + private Integer questionType; //题干 @ApiModelProperty(value = "题干") private String questionDry; diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TeacherDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TeacherDO.java index b9bc9f5..1b9007f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TeacherDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TeacherDO.java @@ -54,14 +54,23 @@ public class TeacherDO extends BaseDO { //考核结果 @ApiModelProperty(value = "考核结果") private String assessmentResult; - //状态（0-禁用 1-启用）(老项目0启用,1禁用) - @ApiModelProperty(value = "状态（0-禁用 1-启用）(老项目0启用,1禁用)") + //状态（0启用,1禁用) + @ApiModelProperty(value = "状态（0启用,1禁用)") private Integer state; @ApiModelProperty(value = "证书数量") @TableField(exist = false) private Integer certificateCount; + @ApiModelProperty(value = "身份证") + @TableField(exist = false) + private String userIdCard; + @ApiModelProperty(value = "文化程度字典") + @TableField(exist = false) + private String culturalLevel; + @ApiModelProperty(value = "文化程度子字典名称") + @TableField(exist = false) + private String culturalLevelName; public TeacherDO(String teacherId) { this.teacherId = teacherId; diff --git a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/VideoCoursewareDO.java b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/VideoCoursewareDO.java index 7105534..a196ba1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/VideoCoursewareDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/VideoCoursewareDO.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotEmpty; import java.math.BigDecimal; /** @@ -39,6 +40,8 @@ public class VideoCoursewareDO extends BaseDO { //课件文件路径 @ApiModelProperty(value = "课件文件路径") private String videoFiles; + @ApiModelProperty(value = "课件文件名称", name = "videoName") + private String videoName; //课件描述 @ApiModelProperty(value = "课件描述") private String coursewareIntroduce; @@ -62,6 +65,9 @@ public class VideoCoursewareDO extends BaseDO { @ApiModelProperty(value = "企业类型") @TableField(exist = false) private Integer corpType; + @ApiModelProperty(value = "习题数") + @TableField(exist = false) + private Integer questionCount; public VideoCoursewareDO(String videoCoursewareId) { this.videoCoursewareId = videoCoursewareId; diff --git a/web-infrastructure/src/main/resources/mapper/TeacherMapper.xml b/web-infrastructure/src/main/resources/mapper/TeacherMapper.xml index 054c561..9d23f00 100644 --- a/web-infrastructure/src/main/resources/mapper/TeacherMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/TeacherMapper.xml @@ -50,7 +50,10 @@