diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java index 0f2d9ff..fd52e3c 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java @@ -49,8 +49,8 @@ public class UserEmploymentLogAddCmd extends Command { @NotEmpty(message = "岗位名称不能为空") private String postName; - @ApiModelProperty(value = "入职状态,1-入职 0-离职", name = "employmentFlag", required = true) - @NotNull(message = "入职状态,1-入职 0-离职不能为空") + @ApiModelProperty(value = "入职状态,1-在职 0-离职", name = "employmentFlag", required = true) + @NotNull(message = "入职状态,1-在职 0-离职不能为空") private Integer employmentFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java index a2be6d4..7d49b55 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java @@ -48,8 +48,8 @@ public class UserEmploymentLogUpdateCmd extends Command { @ApiModelProperty(value = "岗位名称", name = "postName", required = true) @NotEmpty(message = "岗位名称不能为空") private String postName; - @ApiModelProperty(value = "入职状态,1-入职 0-离职", name = "employmentFlag", required = true) - @NotNull(message = "入职状态,1-入职 0-离职不能为空") + @ApiModelProperty(value = "入职状态,1-在职 0-离职", name = "employmentFlag", required = true) + @NotNull(message = "入职状态,1-在职 0-离职不能为空") private Integer employmentFlag; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java index 09e1ab5..c3f81e9 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java @@ -169,7 +169,7 @@ public class UserCO extends ClientObject { private String mappingPostName; private String mappingDeptName; // 入职状态 - @ApiModelProperty(value = "入职状态 1-入职 0-离职") + @ApiModelProperty(value = "入职状态 1-在职 0-离职") private Integer employmentFlag; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java index 750dc11..0c85864 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java @@ -40,8 +40,8 @@ public class UserEmploymentLogCO extends ClientObject { //岗位名称 @ApiModelProperty(value = "岗位名称") private String postName; - //入职状态,1-入职 0-离职 - @ApiModelProperty(value = "入职状态,1-入职 0-离职") + //入职状态,1-在职 0-离职 + @ApiModelProperty(value = "入职状态,1-在职 0-离职") private Integer employmentFlag; //是否删除 @ApiModelProperty(value = "是否删除") diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java index 396263d..80a89b8 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java @@ -32,7 +32,7 @@ public class UserEmploymentLogE extends BaseE { private Long postId; //岗位名称 private String postName; - //入职状态,1-入职 0-离职 + //入职状态,1-在职 0-离职 private Integer employmentFlag; //是否删除 private String deleteEnum; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java index ae5c16e..c23a936 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java @@ -42,8 +42,8 @@ public class UserEmploymentLogDO extends BaseDO { //岗位名称 @ApiModelProperty(value = "岗位名称") private String postName; - //入职状态,1-入职 0-离职 - @ApiModelProperty(value = "入职状态,1-入职 0-离职") + //入职状态,1-在职 0-离职 + @ApiModelProperty(value = "入职状态,1-在职 0-离职") private Integer employmentFlag; public UserEmploymentLogDO(String userEmploymentLogId) { diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java index d87209d..57256a8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java @@ -57,7 +57,7 @@ public class UserQualificationInfoDO extends BaseDO { @TableField(exist = false) private String userName; - @ApiModelProperty(value = "入职状态, 1-入职 0-离职") + @ApiModelProperty(value = "入职状态, 1-在职 0-离职") @TableField(exist = false) private String employmentFlagName; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index dcd6408..8f3fe4a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -212,7 +212,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i if(userDO.getSort() == null){ userDO.setSort(9999); } - // 新增用户默认入职 + // 新增用户默认在职 userDO.setEmploymentFlag(1); save(userDO); }