diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index 258a567..abdd3f3 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -193,6 +193,11 @@ public class UserAddExe { } } + // 插入user_corp_record表 + UserCorpRecordE userCorpRecordE = new UserCorpRecordE(); + userCorpRecordE.initAddFromApp(userE, cmd.getCorpinfoName(), cmd.getDepartmentName()); + userCorpRecordGateway.add(userCorpRecordE); + // 插入user_change_record表 UserChangeRecordE userChangeRecordE = new UserChangeRecordE(); userChangeRecordE.initUserAddFromApp(userE, cmd.getCorpinfoName(), cmd.getDepartmentName()); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserOnboardingCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserOnboardingCmd.java index ba978f1..a98222e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserOnboardingCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/AppUserOnboardingCmd.java @@ -42,8 +42,8 @@ public class AppUserOnboardingCmd extends Command { @NotEmpty(message = "部门名称不能为空") private String departmentName; - @ApiModelProperty(value = "部门名称", name = "departmentName", required = true) - @NotEmpty(message = "部门名称不能为空") + @ApiModelProperty(value = "岗位名称", name = "postName", required = true) + @NotEmpty(message = "岗位名称不能为空") private String postName; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserCorpRecordE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserCorpRecordE.java index c406322..0ff72ba 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserCorpRecordE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserCorpRecordE.java @@ -79,6 +79,18 @@ public class UserCorpRecordE extends BaseE { this.startTime = LocalDateTime.now(); } + public void initAddFromApp(UserE userE,String corpName,String departmentName) { + this.userId = userE.getId(); + this.corpinfoId = userE.getCorpinfoId(); + this.corpinfoName = corpName; + this.departmentId = userE.getDepartmentId(); + this.departmentName = departmentName; + this.postId = userE.getPostId(); + this.postName = userE.getPostName(); + this.employmentFlag = UserEmploymentFlagEnum.ENTRY_AUDIT.getCode(); + this.status = UserChangeRecordStatusEnum.PENDING.getCode(); + } + public void executeResignation(UserCorpRecordE userCorpRecordE, UserE userE,Integer employmentFlag,Integer status) { this.corpinfoName = userCorpRecordE.getCorpinfoName(); this.departmentId = userE.getDepartmentId();