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

Compare commits

base: zcloud_gbs:066c63b4d245baeaaf3398a80f0ad86bd6446c7d
Branches Tags
zcloud_gbs:dev_xiangguanfang
zcloud_gbs:main
..
compare: zcloud_gbs:97cb9b55e0abd308276d47e372c8f28b9adb4b0f
Branches Tags
zcloud_gbs:dev_xiangguanfang
zcloud_gbs:main

No commits in common. "066c63b4d245baeaaf3398a80f0ad86bd6446c7d" and "97cb9b55e0abd308276d47e372c8f28b9adb4b0f" have entirely different histories.
066c63b4d2 ... 97cb9b55e0

1 changed files with 8 additions and 18 deletions
Show Stats Expand all files Collapse all files

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

@ -413,29 +413,17 @@ public class UserUpdateExe {
userChangeRecordE.executeReviewStatus(userEOld, UserEmploymentFlagEnum.ON.getCode(), UserChangeRecordStatusEnum.APPROVED.getCode()); userChangeRecordE.executeReviewStatus(userEOld, UserEmploymentFlagEnum.ON.getCode(), UserChangeRecordStatusEnum.APPROVED.getCode());
userCorpRecordE.setStartTime(LocalDateTime.now()); userCorpRecordE.setStartTime(LocalDateTime.now());
userChangeRecordGateway.add(userChangeRecordE); userChangeRecordGateway.add(userChangeRecordE);
SingleResponse<UserDetailCO> detail = null; log.info("GBS获取用户信息开始,用户id:{}", userDO.getId());
try{ SingleResponse<UserDetailCO> detail = userFacade.getDetail(userDO.getId());
log.info("GBS获取用户信息开始,用户id:{}", userDO.getId()); log.info("GBS获取用户信息结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(detail));
detail = userFacade.getDetail(userDO.getId()); if (detail.isSuccess() && detail.getData() != null ) {
log.info("GBS获取用户信息结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(detail));
}catch (Exception e){
e.printStackTrace();
log.info("GBS获取用户信息异常,用户id:{},错误信息:{}", userDO.getId(), e.getMessage());
// throw new BizException("GBS获取用户信息异常");
}
if (detail!=null && detail.isSuccess() && detail.getData() != null ) {
if( !detail.getData().getJobStatusEnum()){ if( !detail.getData().getJobStatusEnum()){
//离职，重新入职 //离职，重新入职
UserUpdateQuitCmd userUpdateQuitCmd = new UserUpdateQuitCmd(); UserUpdateQuitCmd userUpdateQuitCmd = new UserUpdateQuitCmd();
userUpdateQuitCmd.setId(userDO.getId()); userUpdateQuitCmd.setId(userDO.getId());
log.info("executeXgf,GBS恢复用户入职请求: {}",JSONUtil.toJsonStr(userUpdateQuitCmd)); log.info("executeXgf,GBS恢复用户入职请求: {}",JSONUtil.toJsonStr(userUpdateQuitCmd));
try{ Response response = userFacade.restoreJob(userUpdateQuitCmd);
Response response = userFacade.restoreJob(userUpdateQuitCmd); log.info("executeXgf,GBS恢复用户入职返回: {}",JSONUtil.toJsonStr(response));
log.info("executeXgf,GBS恢复用户入职返回: {}",JSONUtil.toJsonStr(response));
}catch (Exception e){
log.info("executeXgf,GBS恢复用户入职异常: {}",e.getMessage());
}
}else{ }else{
//在职，不处理 //在职，不处理
} }
@ -461,6 +449,8 @@ public class UserUpdateExe {
} }
userDO.setId(gbsResult.getData()); userDO.setId(gbsResult.getData());
} }
} else { } else {
//驳回 //驳回
//驳回 //驳回