zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev:文案修改:入职->在职

main
SondonYong 2025-12-01 10:40:34 +08:00
parent a5aba89f61
commit 61b3655b0a
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogAddCmd.java
View File

@ -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;
}

4
web-client/src/main/java/com/zcloud/basic/info/dto/UserEmploymentLogUpdateCmd.java
View File

@ -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;
}

2
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
View File

@ -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;

4
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserEmploymentLogCO.java
View File

@ -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 = "是否删除")

2
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserEmploymentLogE.java
View File

@ -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;

4
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserEmploymentLogDO.java
View File

@ -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) {

2
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java
View File

@ -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;

2
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
View File

@ -212,7 +212,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
if(userDO.getSort() == null){
userDO.setSort(9999);
}
// 新增用户默认入职
// 新增用户默认在职
userDO.setEmploymentFlag(1);
save(userDO);
}