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

chore(build): 修改日志

dev_human_push
zhaokai 2026-07-09 16:16:54 +08:00
parent 33e3598981
commit 4e66d236d9
3 changed files with 9 additions and 7 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/HumanUserUpdateExe.java
View File

@ -239,9 +239,11 @@ public class HumanUserUpdateExe {
* @param userUpdateCmd 修改命令
*/
private void executeInsideCorpUpdate(UserDO oldUserDO, UserUpdateCmd userUpdateCmd) {
userUpdateCmd.setEmploymentFlag(oldUserDO.getEmploymentFlag());
userUpdateCmd.setRzFlag(CommonFlagEnum.YES.getCode());
userUpdateExe.execute(userUpdateCmd);
// userUpdateCmd.setEmploymentFlag(oldUserDO.getEmploymentFlag());
UserUpdateCmd userUpdateCmdNew = new UserUpdateCmd();
BeanUtils.copyProperties(oldUserDO, userUpdateCmdNew);
userUpdateCmdNew.setRzFlag(CommonFlagEnum.YES.getCode());
userUpdateExe.execute(userUpdateCmdNew);
UserDO newUserDO = userRepository.getInfoById(oldUserDO.getId());
if (newUserDO == null) {
@ -377,7 +379,7 @@ public class HumanUserUpdateExe {
UserE oldUserE = buildUserE(oldUserDO);
UserE newUserE = buildUserE(newUserDO);
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.initUserUpdate(newUserE, oldUserE, resolveCorpinfoName(newUserDO), resolveDepartmentName(newUserDO));
userChangeRecordE.initUserUpdate(newUserE, oldUserE, resolveCorpinfoName(newUserDO), resolveDepartmentName(newUserDO),UserChangeRecordStatusEnum.PENDING.getCode());
userChangeRecordGateway.add(userChangeRecordE);
}

2
web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
View File

@ -228,7 +228,7 @@ public class UserUpdateExe {
BeanUtils.copyProperties(newUserDO, newUserE);
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.initUserUpdate(newUserE, oldUserE, newUserDO.getCorpinfoName(), newUserDO.getDepartmentName());
userChangeRecordE.initUserUpdate(newUserE, oldUserE, newUserDO.getCorpinfoName(), newUserDO.getDepartmentName(),UserChangeRecordStatusEnum.APPROVED.getCode());
userChangeRecordGateway.add(userChangeRecordE);
}

4
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserChangeRecordE.java
View File

@ -119,7 +119,7 @@ public class UserChangeRecordE extends BaseE {
this.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode());
}
public void initUserUpdate(UserE userE, UserE oldUserE, String corpName, String name) {
public void initUserUpdate(UserE userE, UserE oldUserE, String corpName, String name,int status) {
this.setUserId(userE.getId());
this.setChangeTime(new Date());
this.setCorpinfoIdBefore(oldUserE.getCorpinfoId());
@ -138,7 +138,7 @@ public class UserChangeRecordE extends BaseE {
this.setPostNameAfter(userE.getPostName());
this.setUserNameAfter(userE.getName());
this.setUserStatusAfter(oldUserE.getEmploymentFlag());
this.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode());
this.setStatus(status);
}
/**
* 离职相关