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

fix(user): 解决用户变更记录和跨企业变更功能问题

dev_human_push
zhaokai 2026-06-23 14:42:18 +08:00
parent b43696469c
commit d57c5e9d1c
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web-app/src/main/java/com/zcloud/basic/info/command/HumanUserUpdateExe.java
View File

@ -406,6 +406,14 @@ public class HumanUserUpdateExe {
UserE userE = buildUserE(userAddCmd, userId);
createOrUpdateCurrentCorpRecord(userE, userAddCmd.getCorpinfoName(), userAddCmd.getDepartmentName());
// createAddChangeRecord(userE, userAddCmd.getCorpinfoName(), userAddCmd.getDepartmentName());
UserChangeRecordE userChangeRecordENew = new UserChangeRecordE();
BeanUtils.copyProperties(userChangeRecordE, userChangeRecordENew);
userChangeRecordENew.setId(null);
userChangeRecordENew.setUserChangeRecordId(null);
userChangeRecordENew.setUserId(userId);
userChangeRecordENew.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode());
userChangeRecordGateway.add(userChangeRecordENew);
log.info("跨企业变更新企业入职完成，原用户id:{}, 新用户id:{}, 新企业id:{}",
oldUserDO.getId(), userId, userAddCmd.getCorpinfoId());
return userId;

8
web-app/src/main/java/com/zcloud/basic/info/command/UserChangeRecordWorkChangeExe.java
View File

@ -444,8 +444,16 @@ public class UserChangeRecordWorkChangeExe {
Long newUserId = createEntryUserByChangeRecord(userDO, userChangeRecordDO);
log.info("跨企业变更工作交接收口完成新企业入职，原用户id:{}, 新用户id:{}, 变更记录:{}",
userDO.getId(), newUserId, userChangeRecordId);
UserChangeRecordE userChangeRecordENew = new UserChangeRecordE();
BeanUtils.copyProperties(userChangeRecordDO, userChangeRecordENew);
userChangeRecordENew.setId(null);
userChangeRecordENew.setUserChangeRecordId(null);
userChangeRecordENew.setUserId(newUserId);
userChangeRecordENew.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode());
userChangeRecordGateway.add(userChangeRecordENew);
}
updateUserChangeRecord(userChangeRecordDO);
}
/**

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

@ -8,6 +8,7 @@ import lombok.Data;
import java.time.LocalDateTime;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
/**
@ -30,7 +31,7 @@ public class UserChangeRecordCO extends ClientObject {
//变更时间
@ApiModelProperty(value = "变更时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime changeTime;
private Date changeTime;
//入职状态，1-待审批, 2-通过
@ApiModelProperty(value = "入职状态，1-待审批, 2-通过")
private Integer status;

4
web-infrastructure/src/main/resources/mapper/UserChangeRecordMapper.xml
View File

@ -21,8 +21,8 @@
LEFT JOIN user u ON ucr.user_id = u.id
<where>
ucr.delete_enum = 'FALSE'
<if test="params.userId != null">
AND ucr.user_id = #{params.userId}
<if test="params.eqUserId != null">
AND ucr.user_id = #{params.eqUserId}
</if>
<if test="params.status != null">
AND ucr.status = #{params.status}

6
web-infrastructure/src/main/resources/mapper/UserMapper.xml
View File

@ -7,7 +7,10 @@
select
c.corp_name as corpinfoName,
d.name as department_name,
p.post_name,
CASE
WHEN c.type IN (3,4, 5) THEN u.post_name
ELSE p.post_name
END AS post_name,
u.id,
u.user_id,
u.username,
@ -248,6 +251,7 @@
u.political_affiliation_name,
u.employment_flag,
u.flow_flag,
u.rz_flag,
CASE
WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN