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

dev: 扫码入职流程优化

dev_xiangguanfang
SondonYong 2025-12-30 08:58:06 +08:00
parent 2d5dc0a37e
commit 560edb340c
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -210,10 +210,8 @@ public class UserAddExe {
throw new BizException("该用户在当前企业存在未离职信息，无法重新入职");
}
// user表状态变为入职待审核
u.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
BeanUtils.copyProperties(u, userE);
userE.setDepartmentId(cmd.getDepartmentId());
userE.setPostName(cmd.getPostName());
userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(), null);
userGateway.update(userE);
corpFlag = true;
break;
@ -230,11 +228,7 @@ public class UserAddExe {
UserDO user = firstUserWithIdCard.get();
BeanUtils.copyProperties(user, userE);
userE.setId(null);
userE.setUserId(UuidUtil.get32UUID());
userE.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
userE.setCorpinfoId(cmd.getCorpinfoId());
userE.setDepartmentId(cmd.getDepartmentId());
userE.setPostName(cmd.getPostName());
userE.initFormOnboarding(cmd.getCorpinfoId(), cmd.getDepartmentId(), cmd.getPostName(), UuidUtil.get32UUID());
userRepository.saveOnboardingUser(userE);
} else {
// 没有找到符合条件的用户

11
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.jjb.saas.framework.domain.model.BaseE;
import com.jjb.saas.framework.utils.DataEncryptDecryptUtil;
import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum;
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
@ -175,6 +176,16 @@ public class UserE extends BaseE {
userE.setPassword(defaultPassword);
}
public void initFormOnboarding(Long corpinfoId, Long departmentId, String postName, String userId){
this.setCorpinfoId(corpinfoId);
this.setDepartmentId(departmentId);
this.setName(postName);
this.setEmploymentFlag(UserEmploymentFlagEnum.ENTRY_AUDIT.getCode());
if(StringUtils.isNotEmpty(userId)){
this.setUserId(userId);
}
}
public void initFromRZ(Long corpinfoId, Long roleId, RzUserRecordE rzUserRecordE){
this.setCorpinfoId(corpinfoId);
this.setDepartmentId(corpinfoId);