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

离职入职相关

main
zhaokai 2025-12-05 10:14:01 +08:00
parent 1c73ffe3b8
commit 40b5a4ce58
21 changed files with 262 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
start/src/main/java/com/zcloud/basic/info/Application.java
View File

@ -14,7 +14,7 @@ import org.springframework.boot.SpringApplication;
mapperPackages = {"com.zcloud.basic.info.persistence.mapper"}
)
//@EnableFacadeRpcClient
@EnableConsumer
//@EnableConsumer
public class Application {
public static void main(String[] args) {

14
web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java
View File

@ -1,7 +1,6 @@
package com.zcloud.basic.info.web;
import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
@ -9,18 +8,13 @@ import com.jjb.saas.framework.auth.model.SSOUser;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.basic.info.api.CorpInfoServiceI;
import com.zcloud.basic.info.dto.*;
import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
import com.zcloud.basic.info.dto.clientobject.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
* web-adapter
*
@ -67,6 +61,12 @@ public class CorpInfoController {
}
return SingleResponse.of(corpInfoService.info(id));
}
@ApiOperation("根据登录人密码获取企业手机号相关信息")
@PostMapping("/getEncryInfo/{id}")
public SingleResponse<CorpInfoEncryCO> getEncryInfo(@Validated @RequestBody UserCheckPassWordCmd userCheckPassWordCmd) {
return SingleResponse.of(corpInfoService.getEncryInfo(userCheckPassWordCmd));
}
@ApiOperation("删除")
@PostMapping("/remove/{id}")

29
web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java
View File

@ -43,20 +43,6 @@ import javax.servlet.http.HttpServletResponse;
public class UserController {
private final UserServiceI userService;
private final TranslateField translateField;
// @DubboReference
// private List<ZcloudUserJobFacade> userJobFacadeList;
@ApiOperation("新增用户")
@PostMapping("/test")
public SingleResponse<UserCO> test(@RequestBody UserCO cmd) {
// SSOUser ssoUser = AuthContext.getCurrentUser();
// List<UserCO> userCOS = translateField.translateZcloudCommonInformation(Arrays.asList(cmd), UserCO.class);
// ZcloudDepartmentInfoCo zcloudDpetInfoById = translateField.getZcloudDpetInfoById(1985993429287899137L);
// ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985972624130953218L);
return SingleResponse.of(cmd);
}
@ApiOperation("验证用户是否存在")
@PostMapping("/verifyUser")
@ -93,21 +79,6 @@ public class UserController {
@ApiOperation("详情")
@GetMapping("/{id}")
public SingleResponse<UserCO> getInfoById(@PathVariable("id") Long id) {
/* ZcloudUserJobQry zcloudUserJobQry = new ZcloudUserJobQry();
zcloudUserJobQry.setUserId(11L);
zcloudUserJobQry.setCorpinfoId(123L);
List<ZcloudUserJobCo> allJob = new ArrayList<>();
userJobFacadeList.forEach(userJobFacade -> {
try {
MultiResponse<ZcloudUserJobCo> userJob = userJobFacade.getUserJob(zcloudUserJobQry);
List<ZcloudUserJobCo> data = userJob.getData();
allJob.addAll(data);
}catch (Exception e){
System.out.println( e);
}
});
System.out.println(allJob);*/
return userService.getInfoById(id);
}
@ApiOperation("获取当前登录人信息")

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

@ -1,23 +1,28 @@
package com.zcloud.basic.info.command;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.jjb.saas.system.client.user.facade.UserFacade;
import com.zcloud.basic.info.constant.RedisConstant;
import com.zcloud.basic.info.command.convertor.UserJobHandoverCoConvertor;
import com.zcloud.basic.info.domain.enums.UserChangeRecordStatusEnum;
import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum;
import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum;
import com.zcloud.basic.info.domain.enums.UserJobStatusEnum;
import com.zcloud.basic.info.domain.enums.*;
import com.zcloud.basic.info.domain.gateway.*;
import com.zcloud.basic.info.domain.model.*;
import com.zcloud.basic.info.dto.*;
import com.zcloud.basic.info.dto.clientobject.UserJobHandoverCO;
import com.zcloud.basic.info.persistence.dataobject.*;
import com.zcloud.basic.info.persistence.repository.*;
import com.zcloud.gbscommon.utils.Tools;
import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
import com.zcloud.gbscommon.zcloudhidden.face.ZcloudHiddenFacade;
import com.zcloud.gbscommon.zcloudhidden.request.HiddenStatisticsListQry;
import com.zcloud.gbscommon.zcloudhidden.request.HiddenUpdateCmd;
import com.zcloud.gbscommon.zcloudhidden.response.HiddenListByUserCO;
import com.zcloud.gbscommon.zcloudhidden.response.HiddenListCO;
import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserJobFacade;
import com.zcloud.gbscommon.zclouduser.request.ZcloudUserJobQry;
import com.zcloud.gbscommon.zclouduser.response.ZcloudUserJobCo;
@ -59,11 +64,12 @@ public class UserUpdateExe {
private final UserCorpRecordGateway userCorpRecordGateway;
private final UserJobHandoverRepository userJobHandoverRepository;
private final UserJobHandoverCoConvertor userJobHandoverCoConvertor;
private final UserChangeRecordRepository userChangeRecordRepository;
@DubboReference
private UserFacade userFacade;
private ZcloudRedisUtil zcloudRedisUtil;
// @DubboReference
// private List<ZcloudUserJobFacade> userJobFacadeList;
@DubboReference
private ZcloudHiddenFacade zcloudHiddenFacade;
@ -239,10 +245,12 @@ public class UserUpdateExe {
//TODO 处理未完成工作
List<UserJobHandoverDO> allJob = getUserJob(userDO.getId(),corpinfoId,userChangeRecordE.getUserChangeRecordId());
userJobHandoverRepository.saveBatch(allJob);
//离职发送方mq消息
userRepository.sendResignationMq(userResignationCmd.getUserId(),corpinfoId);
//TODO 离职发送,循环调用，失败的话，返回失败，
ResignatioChangeJob(allJob);
}
public void executeReviewStatus(UserReviewStatusCmd userReviewStatusCmd) {
//获取用户信息,并更新审核状态
UserDO userDO = userRepository.getInfoById(userReviewStatusCmd.getUserId());
@ -264,6 +272,11 @@ public class UserUpdateExe {
}
/**
* 离职
* @param userDO
* @param userReviewStatusCmd
*/
private void ReviewResignationAudit(UserDO userDO, UserReviewStatusCmd userReviewStatusCmd) {
Integer reviewStatus = userReviewStatusCmd.getReviewStatus();
//TODO 驳回需要待处理，暂时按照只能通过处理
@ -293,10 +306,16 @@ public class UserUpdateExe {
userCorpRecordE.initResignation(userE, UserEmploymentFlagEnum.RESIGNATION.getCode(), UserChangeRecordStatusEnum.APPROVED.getCode());
userCorpRecordGateway.add(userCorpRecordE);
}
// 发送mq消息 ，人员离职
userRepository.sendResignationMq(userE.getId(),corpinfoId);
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.executeReviewStatus(userE, UserEmploymentFlagEnum.RESIGNATION.getCode(),UserChangeRecordStatusEnum.APPROVED.getCode());
userChangeRecordGateway.add(userChangeRecordE);
// TODO 人员离职，相关工作处理，有一个失败则，审批失败
//处理未完成的工作
userJobHandoverRepository.processUserJobHandover(userCorpRecordE.getUserCorpRecordId());
//获取未完成工作
List<UserJobHandoverDO> allJob = userJobHandoverRepository.getListByChangerRecordId(userChangeRecordE.getUserChangeRecordId());
ResignatioChangeJob(allJob);
} else {
//驳回
UserCorpRecordDO userCorpRecordDO = userCorpRecordRepository.getInfoByUserId(userDO.getId(), corpinfoId, UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode());
@ -309,6 +328,9 @@ public class UserUpdateExe {
userCorpRecordE.initResignation(userE, UserEmploymentFlagEnum.ON.getCode(), UserChangeRecordStatusEnum.REJECTED.getCode());
userCorpRecordGateway.add(userCorpRecordE);
}
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.executeReviewStatus(userE, UserEmploymentFlagEnum.ON.getCode(),UserChangeRecordStatusEnum.REJECTED.getCode());
userChangeRecordGateway.add(userChangeRecordE);
}
}
@ -339,10 +361,11 @@ public class UserUpdateExe {
BeanUtils.copyProperties(userDO, userCorpRecordE);
userCorpRecordE.initAdd(userE, corpInfoDO.getCorpName(), departmentDO.getName());
userCorpRecordGateway.add(userCorpRecordE);
// 增加用户变更记录
// 增加用户变更记录 ,获取变更记录
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.executeReviewStatus(userE, UserEmploymentFlagEnum.ON.getCode());
userChangeRecordE.executeReviewStatus(userE, UserEmploymentFlagEnum.ON.getCode(),UserChangeRecordStatusEnum.APPROVED.getCode());
userChangeRecordGateway.add(userChangeRecordE);
} else {
//驳回
//驳回
@ -353,6 +376,9 @@ public class UserUpdateExe {
userCorpRecordE.executeEntryAudit(userCorpRecordE, userE, UserEmploymentFlagEnum.NOT_ON.getCode(), UserChangeRecordStatusEnum.REJECTED.getCode());
userCorpRecordGateway.update(userCorpRecordE);
}
UserChangeRecordE userChangeRecordE = new UserChangeRecordE();
userChangeRecordE.executeReviewStatus(userE, UserEmploymentFlagEnum.NOT_ON.getCode(),UserChangeRecordStatusEnum.REJECTED.getCode());
userChangeRecordGateway.add(userChangeRecordE);
}
}
@ -386,7 +412,6 @@ public class UserUpdateExe {
userChangeRecordE.executeResignation(userE, UserEmploymentFlagEnum.RESIGNATION_AUDIT.getCode(), UserChangeRecordStatusEnum.PENDING.getCode(), employmentFlagBefore);
userChangeRecordGateway.add(userChangeRecordE);
//TODO 处理未完成工作
List<UserJobHandoverDO> allJob = getUserJob(userDO.getId(),corpinfoId,userChangeRecordE.getUserChangeRecordId());
userJobHandoverRepository.saveBatch(allJob);
}
@ -396,6 +421,25 @@ public class UserUpdateExe {
zcloudUserJobQry.setUserId(userId);
zcloudUserJobQry.setCorpinfoId(corpinfoId);
List<UserJobHandoverDO> allJob = new ArrayList<>();
//隐患id
HiddenStatisticsListQry hiddenStatisticsListQry = new HiddenStatisticsListQry() ;
hiddenStatisticsListQry.setUserId(userId);
MultiResponse<HiddenListByUserCO> hiddenListCOMultiResponse = zcloudHiddenFacade.listByUserId(hiddenStatisticsListQry);
if(CollUtil.isNotEmpty(hiddenListCOMultiResponse.getData())){
hiddenListCOMultiResponse.getData().forEach(info -> {
UserJobHandoverDO userJobHandoverDO = new UserJobHandoverDO();
userJobHandoverDO.setUserJobHandoverId(Tools.get32UUID());
userJobHandoverDO.setUserId(userId);
userJobHandoverDO.setWorkProject(info.getWorkProject());
userJobHandoverDO.setWorkContent(info.getWorkContent());
userJobHandoverDO.setForeignKey(info.getHiddenId());
userJobHandoverDO.setWorkType(UserJobHandoverWorkTypeEnum.HIDDENINFO.getCode());
userJobHandoverDO.setUserChangeRecordId(userChangeRecordId);
userJobHandoverDO.setCorpinfoId(corpinfoId);
allJob.add(userJobHandoverDO);
});
}
//循环获取所有未完成工作
/* userJobFacadeList.forEach(userJobFacade -> {
try {
MultiResponse<ZcloudUserJobCo> userJob = userJobFacade.getUserJob(zcloudUserJobQry);
@ -411,6 +455,27 @@ public class UserUpdateExe {
});*/
return allJob;
}
private void ResignatioChangeJob(List<UserJobHandoverDO> allJob) {
allJob.forEach(info->{
//取消工作
UserJobHandoverWorkTypeEnum workTypeEnum = UserJobHandoverWorkTypeEnum.getByCode(info.getWorkType());
switch (workTypeEnum){
case HIDDENINFO:
HiddenUpdateCmd cmd = new HiddenUpdateCmd();
cmd.setUserId(info.getUserId());
SingleResponse singleResponse = zcloudHiddenFacade.updateHiddenByUserId(cmd);
userJobHandoverRepository.processUserJobHandover(info.getUserChangeRecordId());
//隐患出异常是直接抛异常
break;
}
});
}
}

28
web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java
View File

@ -13,22 +13,23 @@ import com.zcloud.basic.info.domain.enums.UserTypeEnum;
import com.zcloud.basic.info.domain.model.CorpDepartmentE;
import com.zcloud.basic.info.domain.model.CorpInfoE;
import com.zcloud.basic.info.domain.model.DepartmentE;
import com.zcloud.basic.info.domain.model.UserE;
import com.zcloud.basic.info.dto.*;
import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoEncryCO;
import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO;
import com.zcloud.basic.info.persistence.dataobject.*;
import com.zcloud.basic.info.persistence.repository.*;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import javax.validation.constraints.NotNull;
import java.util.*;
import java.util.stream.Collectors;
@ -100,6 +101,23 @@ public class CorpInfoQueryExe {
corpInfoCO.setSelectfromList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.SELECTFROM.getCode())));
return corpInfoCO;
}
public CorpInfoEncryCO CorpInfoEncryCO(UserCheckPassWordCmd userCheckPassWordCmd) {
UserE userE = new UserE();
BeanUtils.copyProperties(userCheckPassWordCmd, userE);
userE.encryptionPassword();
Boolean checkStatus = userRepository.checkUserPassWordEncryInfo(userE.getPassword());
if(!checkStatus){
throw new BizException("密码错误");
}
CorpInfoDO corpInfoDO = corpInfoRepository.getById(userCheckPassWordCmd.getId());
CorpInfoEncryCO corpInfoCO = new CorpInfoEncryCO();
BeanUtils.copyProperties(corpInfoDO, corpInfoCO);
return corpInfoCO;
}
public Boolean execute(CorpInfoCheckCodeQry qry) {
List<CorpInfoDO> list = new ArrayList<>();
@ -230,5 +248,7 @@ public class CorpInfoQueryExe {
}
return true;
}
}

6
web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
import com.zcloud.basic.info.dto.*;
import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoEncryCO;
import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
import com.zcloud.gbscommon.utils.Tools;
import lombok.AllArgsConstructor;
@ -79,6 +80,11 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
return corpInfoQueryExe.info(id);
}
@Override
public CorpInfoEncryCO getEncryInfo(UserCheckPassWordCmd userCheckPassWordCmd) {
return corpInfoQueryExe.CorpInfoEncryCO(userCheckPassWordCmd);
}
@Override
public PageResponse<CorpDepartmentCO> corpDepartlist(CorpDepartmentQry qry) {
return corpInfoQueryExe.corpDepartlist(qry);

3
web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java
View File

@ -5,6 +5,7 @@ import com.alibaba.cola.dto.SingleResponse;
import com.zcloud.basic.info.dto.*;
import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoEncryCO;
import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
import java.util.Collection;
@ -48,5 +49,7 @@ public interface CorpInfoServiceI {
List<CorpInfoCO> listByCorpIds(Collection<Long> collection);
Boolean verifyCorpInfo();
CorpInfoEncryCO getEncryInfo(UserCheckPassWordCmd userCheckPassWordCmd);
}

9
web-client/src/main/java/com/zcloud/basic/info/dto/UserJobHandoverAddCmd.java
View File

@ -26,6 +26,9 @@ public class UserJobHandoverAddCmd extends Command {
@ApiModelProperty(value = "用户变更记录id", name = "userChangeRecordId", required = true)
@NotEmpty(message = "用户变更记录id不能为空")
private String userChangeRecordId;
//企业id
@ApiModelProperty(value = "企业id")
private Long corpinfoId;
@ApiModelProperty(value = "用户id", name = "userId", required = true)
@NotNull(message = "用户id不能为空")
@ -35,6 +38,12 @@ public class UserJobHandoverAddCmd extends Command {
@NotNull(message = "变更时间不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date changeTime;
//工作类型，1:隐患信息
@ApiModelProperty(value = "工作类型，1:隐患信息")
private Integer workType;
//外键id
@ApiModelProperty(value = "外键id")
private String foreignKey;
@ApiModelProperty(value = "工作项目", name = "workProject", required = true)
@NotEmpty(message = "工作项目不能为空")

6
web-client/src/main/java/com/zcloud/basic/info/dto/UserJobHandoverUpdateCmd.java
View File

@ -39,6 +39,12 @@ public class UserJobHandoverUpdateCmd extends Command {
@NotNull(message = "变更时间不能为空")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date changeTime;
//工作类型，1:隐患信息
@ApiModelProperty(value = "工作类型，1:隐患信息")
private Integer workType;
//外键id
@ApiModelProperty(value = "外键id")
private String foreignKey;
@ApiModelProperty(value = "工作项目", name = "workProject", required = true)
@NotEmpty(message = "工作项目不能为空")
private String workProject;

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

@ -2,6 +2,7 @@ package com.zcloud.basic.info.dto.clientobject;
import com.alibaba.cola.dto.ClientObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jjb.saas.security.starter.serialize.annotation.MobilePhoneMask;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -90,12 +91,14 @@ public class CorpInfoCO extends ClientObject {
private String contacts;
//主要负责人手机号
@ApiModelProperty(value = "主要负责人手机号")
@MobilePhoneMask
private String contactsPhone;
//安全负责人
@ApiModelProperty(value = "安全负责人")
private String safetyName;
//安全负责人手机号
@ApiModelProperty(value = "安全负责人手机号")
@MobilePhoneMask
private String safetyPhone;
//是否规模以上,1:是,0:否
@ApiModelProperty(value = "是否规模以上,1:是,0:否")
@ -122,6 +125,7 @@ public class CorpInfoCO extends ClientObject {
private String lrName;
//法人手机号
@ApiModelProperty(value = "法人手机号")
@MobilePhoneMask
private String lrMobile;
//行业分类
@ApiModelProperty(value = "行业分类")

42
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoEncryCO.java Normal file
View File

@ -0,0 +1,42 @@
package com.zcloud.basic.info.dto.clientobject;
import com.jjb.saas.security.starter.serialize.annotation.MobilePhoneMask;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-30 15:12:49
*/
@Data
public class CorpInfoEncryCO implements Serializable {
//主键
@ApiModelProperty(value = "主键")
private Long id;
//企业名称
@ApiModelProperty(value = "企业名称")
private String corpName;
//主要负责人手机号
@ApiModelProperty(value = "主要负责人手机号")
@MobilePhoneMask
private String contactsPhone;
//安全负责人手机号
@ApiModelProperty(value = "安全负责人手机号")
@MobilePhoneMask
private String safetyPhone;
//法人手机号
@ApiModelProperty(value = "法人手机号")
@MobilePhoneMask
private String lrMobile;
}

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

@ -25,6 +25,9 @@ public class UserJobHandoverCO extends ClientObject {
//用户变更记录id
@ApiModelProperty(value = "用户变更记录id")
private String userChangeRecordId;
//企业id
@ApiModelProperty(value = "企业id")
private Long corpinfoId;
//用户id
@ApiModelProperty(value = "用户id")
private Long userId;
@ -32,6 +35,12 @@ public class UserJobHandoverCO extends ClientObject {
@ApiModelProperty(value = "变更时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime changeTime;
//工作类型，1:隐患信息
@ApiModelProperty(value = "工作类型，1:隐患信息")
private Integer workType;
//外键id
@ApiModelProperty(value = "外键id")
private String foreignKey;
//工作项目
@ApiModelProperty(value = "工作项目")
private String workProject;

33
web-domain/src/main/java/com/zcloud/basic/info/domain/enums/UserJobHandoverWorkTypeEnum.java Normal file
View File

@ -0,0 +1,33 @@
package com.zcloud.basic.info.domain.enums;
import lombok.Getter;
/**
* 工作类型，1:隐患信息
*/
@Getter
public enum UserJobHandoverWorkTypeEnum {
/**
* 工作类型，1:隐患信息
*/
HIDDENINFO(1,"隐患信息"),
;
private final Integer code;
private final String name;
UserJobHandoverWorkTypeEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
//根据code获取枚举
public static UserJobHandoverWorkTypeEnum getByCode(Integer code) {
for (UserJobHandoverWorkTypeEnum e : values()) {
if (e.getCode().equals(code)) {
return e;
}
}
return null;
}
}

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

@ -132,7 +132,7 @@ public class UserChangeRecordE extends BaseE {
* @param userE
* @param employmentFlagAfter
*/
public void executeReviewStatus(UserE userE, Integer employmentFlagAfter) {
public void executeReviewStatus(UserE userE, Integer employmentFlagAfter, Integer status) {
this.setUserId(userE.getId());
this.setChangeTime(new Date());
this.setCorpinfoIdBefore(userE.getCorpinfoId());
@ -149,7 +149,7 @@ public class UserChangeRecordE extends BaseE {
this.setPostIdAfter(null);
this.setPostNameAfter(null);
this.setUserStatusAfter(employmentFlagAfter);
this.setStatus(UserChangeRecordStatusEnum.APPROVED.getCode());
this.setStatus(status);
}
}

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

@ -87,7 +87,9 @@ public class UserCorpRecordE extends BaseE {
this.postName = userE.getPostName();
this.employmentFlag = employmentFlag;
this.status = status;
this.endTime = LocalDateTime.now();
if(UserChangeRecordStatusEnum.APPROVED.getCode().equals( status)){
this.endTime = LocalDateTime.now();
}
}
public void initResignation(UserE userE,Integer employmentFlag,Integer status) {

7
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserJobHandoverE.java
View File

@ -1,6 +1,7 @@
package com.zcloud.basic.info.domain.model;
import com.jjb.saas.framework.domain.model.BaseE;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@ -19,10 +20,16 @@ public class UserJobHandoverE extends BaseE {
private String userJobHandoverId;
//用户变更记录id
private String userChangeRecordId;
//企业id
private Long corpinfoId;
//用户id
private Long userId;
//变更时间
private Date changeTime;
//工作类型，1:隐患信息
private Integer workType;
//外键id
private String foreignKey;
//工作项目
private String workProject;
//工作内容

9
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserJobHandoverDO.java
View File

@ -26,12 +26,21 @@ public class UserJobHandoverDO extends BaseDO {
//用户变更记录id
@ApiModelProperty(value = "用户变更记录id")
private String userChangeRecordId;
//企业id
@ApiModelProperty(value = "企业id")
private Long corpinfoId;
//用户id
@ApiModelProperty(value = "用户id")
private Long userId;
//变更时间
@ApiModelProperty(value = "变更时间")
private Date changeTime;
//工作类型，1:隐患信息
@ApiModelProperty(value = "工作类型，1:隐患信息")
private Integer workType;
//外键id
@ApiModelProperty(value = "外键id")
private String foreignKey;
//工作项目
@ApiModelProperty(value = "工作项目")
private String workProject;

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

@ -24,6 +24,6 @@ public interface UserJobHandoverRepository extends BaseRepository<UserJobHandove
List<UserJobHandoverDO> getListByChangerRecordId(String userChangeRecordId);
void processUserJobHandover(String userCorpRecordId);
void processUserJobHandover(String userChangeRecordId);
}

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

@ -70,11 +70,12 @@ public interface UserRepository extends BaseRepository<UserDO> {
UserDO getEncryInfo(UserE userE);
Boolean checkUserPassWordEncryInfo(String password);
void saveUserXgf(UserDO d);
PageResponse<UserDO> listXgf(Map<String, Object> params);
void sendResignationMq(Long userId, Long corpinfoId);
UserDO getByPhone(String phone);
}

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

@ -66,11 +66,11 @@ public class UserJobHandoverRepositoryImpl extends BaseRepositoryImpl<UserJobHan
@Override
public void processUserJobHandover(String userCorpRecordId) {
public void processUserJobHandover(String userChangeRecordId) {
//根据user_change_record_id 修改状态
LambdaUpdateWrapper<UserJobHandoverDO> updateWrapper = new LambdaUpdateWrapper<>();
// 设置更新条件
updateWrapper.eq(UserJobHandoverDO::getUserChangeRecordId, userCorpRecordId);
updateWrapper.eq(UserJobHandoverDO::getUserChangeRecordId, userChangeRecordId);
updateWrapper.eq(UserJobHandoverDO::getHandoverStatus, UserJobStatusEnum.UNTREATED.getCode());
// 设置要更新的字段

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

@ -407,6 +407,19 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
return getById(userE.getId());
}
@Override
public Boolean checkUserPassWordEncryInfo(String password) {
// 验证老密码是否正确
AccountPasswordCheckCmd accountPasswordCheckCmd = new AccountPasswordCheckCmd();
accountPasswordCheckCmd.setUserId(AuthContext.getUserId());
accountPasswordCheckCmd.setPassword(password);
SingleResponse<Long> response = accountFacade.checkPassword(accountPasswordCheckCmd);
if(!response.isSuccess()){
return false;
}
return true;
}
@Override
public PageResponse<UserDO> listXgf(Map<String, Object> params) {
IPage<UserDO> iPage = new Query<UserDO>().getPage(params);
@ -414,18 +427,6 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public void sendResignationMq(Long userId, Long corpinfoId) {
try{
ZcUserResignation message = new ZcUserResignation();
message.setUserId(userId);
message.setCorpinfoId(corpinfoId);
remoteEventPublisher.sendMessage(message, EventTagConst.userResignationTag);
}catch (Exception e){
log.error("发送离职消息失败, userId: {}, corpinfoId: {}", userId, corpinfoId, e);
}
}
@Override
public UserDO getByPhone(String phone) {