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

Compare commits

base: zcloud_gbs:5b6233931faad7117588ee9779cb24d9dcc65753
Branches Tags
zcloud_gbs:main
..
compare: zcloud_gbs:67654360ea342ff4626b513ab5c8101b913ed305
Branches Tags
zcloud_gbs:main

No commits in common. "5b6233931faad7117588ee9779cb24d9dcc65753" and "67654360ea342ff4626b513ab5c8101b913ed305" have entirely different histories.
5b6233931f ... 67654360ea

7 changed files with 17 additions and 29 deletions
Show Stats Expand all files Collapse all files

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

@ -139,25 +139,18 @@ public class UserUpdateExe {
//
UserE userE=null;
Long corpinfoId = userResignationCmd.getCorpinfoId()==null?AuthContext.getTenantId():userResignationCmd.getCorpinfoId();
Integer employmentFlagBefore;
if(UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())){
UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userDO.getId(), corpinfoId);
if (userCorpDO == null) {
return;
}
employmentFlagBefore = userCorpDO.getEmploymentFlag();
userE=userCorpRepository.executeResignation(userCorpDO, corpinfoId,UserEmploymentFlagEnum.RESIGNATION.getCode());
userE=userCorpRepository.executeResignation(userDO.getId(), corpinfoId,UserEmploymentFlagEnum.RESIGNATION.getCode());
}else{
userE = new UserE();
BeanUtils.copyProperties(userDO, userE);
employmentFlagBefore = userDO.getEmploymentFlag();
userE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION.getCode());
userGateway.update(userE);
}
if(userE==null){
return;
}
//修改企业入职记录
UserCorpRecordDO userCorpRecordDO = userCorpRecordRepository.getInfoByUserId(userDO.getId(), corpinfoId,UserEmploymentFlagEnum.ON.getCode());
@ -173,7 +166,7 @@ public class UserUpdateExe {
// 增加用户变更记录
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.executeResignation(userE,UserEmploymentFlagEnum.RESIGNATION.getCode(),UserChangeRecordStatusEnum.APPROVED.getCode(),employmentFlagBefore);
userChangeRecordE.executeResignation(userE,UserEmploymentFlagEnum.RESIGNATION.getCode(),UserChangeRecordStatusEnum.APPROVED.getCode());
userChangeRecordGateway.add(userChangeRecordE);
//TODO 处理未完成工作
@ -285,24 +278,17 @@ public class UserUpdateExe {
}
UserE userE = null;
Long corpinfoId = appUserResignationCmd.getCorpinfoId()==null?AuthContext.getTenantId():appUserResignationCmd.getCorpinfoId();
Integer employmentFlagBefore = null;
if(UserFlowFlagEnum.FLOW.getCode().equals(userDO.getFlowFlag())){
UserCorpDO userCorpDO = userCorpRepository.getInfoByUserId(userDO.getId(), corpinfoId);
if (userCorpDO == null) {
return;
}
employmentFlagBefore = userCorpDO.getEmploymentFlag();
userE=userCorpRepository.executeResignation(userCorpDO, corpinfoId,UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
userE=userCorpRepository.executeResignation(userDO.getId(), corpinfoId,UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
}else{
userE = new UserE();
BeanUtils.copyProperties(userDO, userE);
employmentFlagBefore = userDO.getEmploymentFlag();
userE.setEmploymentFlag(UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
userGateway.update(userE);
}
//插入变更记录
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.executeResignation(userE,UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode(),UserChangeRecordStatusEnum.PENDING.getCode(),employmentFlagBefore);
userChangeRecordE.executeResignation(userE,UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode(),UserChangeRecordStatusEnum.PENDING.getCode());
userChangeRecordGateway.add(userChangeRecordE);
//TODO 处理未完成工作

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

@ -94,7 +94,7 @@ public class UserChangeRecordE extends BaseE {
* @param userE
* @param code
*/
public void executeResignation(UserE userE, Integer code, Integer status, Integer employmentFlagBefore) {
public void executeResignation(UserE userE, Integer code, Integer status) {
this.setUserId(userE.getId());
this.setChangeTime(new Date());
this.setCorpinfoIdBefore(userE.getCorpinfoId());
@ -103,7 +103,7 @@ public class UserChangeRecordE extends BaseE {
this.setDepartmentNameBefore(userE.getDepartmentName());
this.setPostIdBefore(userE.getPostId());
this.setPostNameBefore(userE.getPostName());
this.setUserStatusBefore(employmentFlagBefore);
this.setUserStatusBefore(userE.getEmploymentFlag());
this.setCorpinfoIdAfter(null);
this.setCorpinfoNameAfter(null);
this.setDepartmentIdAfter(null);

3
web-infrastructure/src/main/java/com/zcloud/basic/info/gatewayimpl/UserGatewayImpl.java
View File

@ -2,7 +2,6 @@ package com.zcloud.basic.info.gatewayimpl;
import com.alibaba.cola.dto.Response;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
import com.zcloud.basic.info.domain.gateway.UserGateway;
import com.zcloud.basic.info.domain.model.UserE;
import com.zcloud.basic.info.persistence.dataobject.UserDO;
@ -47,8 +46,6 @@ public class UserGatewayImpl implements UserGateway {
@Override
public boolean addXgf(UserE userE) {
UserDO d = new UserDO();
// 新增用户默认在职
userE.setEmploymentFlag(UserEmploymentFlagEnum.ON.getCode());
BeanUtils.copyProperties(userE, d);
userE.resetPassword();
userRepository.saveUserXgf(d);

2
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserCorpRepository.java
View File

@ -25,7 +25,7 @@ public interface UserCorpRepository extends BaseRepository<UserCorpDO> {
UserE executeResignation(Long id, Long corpinfoId);
UserE executeResignation(UserCorpDO userCorpDO, Long corpinfoId, Integer employmentFlag);
UserE executeResignation(Long id, Long corpinfoId, Integer employmentFlag);
UserE executeReviewStatus(Long id, Long corpinfoId, Integer reviewStatus);
}

6
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserCorpRepositoryImpl.java
View File

@ -63,7 +63,11 @@ public class UserCorpRepositoryImpl extends BaseRepositoryImpl<UserCorpMapper, U
}
@Override
public UserE executeResignation(UserCorpDO userCorpDO, Long corpinfoId, Integer employmentFlag) {
public UserE executeResignation(Long id, Long corpinfoId, Integer employmentFlag) {
UserCorpDO userCorpDO = getInfoByUserId(id, corpinfoId);
if (userCorpDO == null) {
return null;
}
userCorpDO.setEmploymentFlag(employmentFlag);
userCorpMapper.updateById(userCorpDO);
UserE userE = new UserE();

3
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
View File

@ -282,7 +282,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
if(userDO.getSort() == null){
userDO.setSort(9999);
}
// 新增用户默认在职
userDO.setEmploymentFlag(1);
save(userDO);
}

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

@ -277,7 +277,7 @@
u.name AS name,
u.main_corp_flag AS mainCorpFlag,
u.user_type AS userType,
u.department_id AS departmentId,
u.post_id AS postId,
u.role_id AS roleId,
u.email AS email,
@ -312,7 +312,7 @@
CASE
WHEN u.flow_flag = 0 THEN u.department_id
WHEN u.flow_flag = 1 THEN cpd.id
END AS departmentId,
END AS queryDepartmentId,
CASE
WHEN u.flow_flag = 0 THEN u.corpinfo_id
WHEN u.flow_flag = 1 THEN cp.corpinfo_id