diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java index 0906a3d..09f2c2a 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java @@ -97,7 +97,7 @@ public class UserCertificateAddCmd extends Command { private LocalDate certificateDateEnd; @ApiModelProperty(value = "复审日期", name = "reviewDate", required = true) - @NotNull(message = "复审日期不能为空") +// @NotNull(message = "复审日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate reviewDate; diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java index 92d719b..64623d0 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java @@ -85,7 +85,7 @@ public class UserCertificateUpdateCmd extends Command { @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate certificateDateEnd; @ApiModelProperty(value = "复审日期", name = "reviewDate", required = true) - @NotNull(message = "复审日期不能为空") +// @NotNull(message = "复审日期不能为空") @JsonFormat(pattern = "yyyy-MM-dd") private LocalDate reviewDate; } diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java index 6053376..7ce0721 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/clientobject/UserCertificateCO.java @@ -127,8 +127,6 @@ public class UserCertificateCO extends ClientObject { @ApiModelProperty(value = "环境") private String env; - - @ApiModelProperty(value = "部门名称") private String departmentName; diff --git a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java index 7ca4e5c..e3a398c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java @@ -81,12 +81,6 @@ public class UserCertificateDO extends BaseDO { @ApiModelProperty(value = "复审日期") private LocalDate reviewDate; - @ApiModelProperty(value = "用户名称") - private String userName; - - @ApiModelProperty(value = "在职状态 0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核") - private Integer employmentStatus; - public UserCertificateDO(String userCertificateId) { this.userCertificateId = userCertificateId; } diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index 64c06aa..b9e7f47 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml @@ -58,7 +58,7 @@