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

企业逻辑调整

main
zhaokai 2025-11-10 17:10:19 +08:00
parent 8e097eed65
commit c0e02f7aa7
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoAddExe.java
View File

@ -62,12 +62,13 @@ public class CorpInfoAddExe {
}
DepartmentE departmentE = new DepartmentE();
departmentE.initCorpInfo(corpInfoId,cmd.getCorpName());
Long departmentId = departmentRepository.addCorpDepartment(departmentE);
UserE userE = new UserE();
userE.initCorpInfo(examTypeE,departmentId);
userRepository.addCorpUser(examTypeE);
userE.initCorpInfo(examTypeE,departmentId,corpInfoId);
userRepository.addCorpUser(userE);
UserEmploymentLogE userEmploymentLogE = new UserEmploymentLogE();
BeanUtils.copyProperties(userE, userEmploymentLogE);

2
web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java
View File

@ -29,7 +29,7 @@ public class UserQualificationInfoPageQry extends PageQuery {
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
@ApiModelProperty(value = "企业id", name = "eqCorpinfoId", required = true)
@NotEmpty(message = "企业id不能为空")
@NotNull(message = "企业id不能为空")
private Long eqCorpinfoId;
@ApiModelProperty(value = "用户id", name = "eqUserId")

9
web-domain/src/main/java/com/zcloud/basic/info/domain/model/DepartmentE.java
View File

@ -3,13 +3,9 @@ package com.zcloud.basic.info.domain.model;
import com.alibaba.cola.domain.Entity;
import com.jjb.saas.framework.domain.model.BaseE;
import com.zcloud.gbscommon.utils.Tools;
import com.zcloud.gbscommon.utils.UuidUtil;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotEmpty;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@ -63,9 +59,10 @@ public class DepartmentE extends BaseE {
}
public void initCorpInfo(Long corpInfoId, String corpName) {
public void initCorpInfo(Long corpInfoId, String corpName) {
this.setCorpinfoId(corpInfoId);
this.setLevelName(corpName);
this.setParentId(corpInfoId);
this.setName(corpName);
}
}

5
web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java
View File

@ -4,13 +4,11 @@ import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.framework.domain.model.BaseE;
import com.zcloud.gbscommon.excelEntity.RiskUnitExcelEntity;
import com.zcloud.basic.info.domain.enums.CorpTypeEnum;
import com.zcloud.gbscommon.excelEntity.UserExcelExportEntity;
import com.zcloud.gbscommon.excelEntity.UserExcelImportEntity;
import com.zcloud.gbscommon.utils.ExcelUtils;
import com.zcloud.gbscommon.utils.Tools;
import com.zcloud.gbscommon.utils.UuidUtil;
import lombok.Data;
import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
@ -197,10 +195,11 @@ public class UserE extends BaseE {
return list;
}
public void initCorpInfo(CorpInfoE examTypeE, Long departmentId) {
public void initCorpInfo(CorpInfoE examTypeE, Long departmentId, Long corpInfoId) {
this.setName(examTypeE.getCorpName());
this.setDepartmentId(departmentId);
this.setUserType(CorpTypeEnum.getUserTypeByCode(examTypeE.getType()));
this.setCorpinfoId(corpInfoId);
}
}

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

@ -4,6 +4,7 @@ import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse;
import com.jjb.saas.framework.repository.repo.BaseRepository;
import com.zcloud.basic.info.domain.model.CorpInfoE;
import com.zcloud.basic.info.domain.model.UserE;
import com.zcloud.basic.info.persistence.dataobject.UserDO;
import java.util.List;
@ -31,6 +32,6 @@ public interface UserRepository extends BaseRepository<UserDO> {
List<UserDO> listByPostId(Long postId);
List<UserDO> listByPostIds(Long[] postIds);
void addCorpUser(CorpInfoE examTypeE);
void addCorpUser(UserE userE);
}

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

@ -16,6 +16,7 @@ import com.zcloud.basic.info.persistence.mapper.DepartmentMapper;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import com.zcloud.basic.info.utils.Query;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Tools;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -85,6 +86,9 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
public Long addCorpDepartment(DepartmentE departmentE) {
DepartmentDO departmentDO = new DepartmentDO();
BeanUtils.copyProperties(departmentE, departmentDO);
if(departmentDO.getDepartmentId()==null){
departmentDO.setDepartmentId(Tools.get32UUID());
}
departmentMapper.insert(departmentDO);
return departmentDO.getId();
}

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

@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jjb.saas.framework.repository.common.PageHelper;
import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
import com.zcloud.basic.info.domain.model.CorpInfoE;
import com.zcloud.basic.info.domain.model.UserE;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO;
import com.zcloud.basic.info.persistence.dataobject.UserDO;
@ -16,6 +17,7 @@ import com.zcloud.basic.info.persistence.mapper.UserMapper;
import com.zcloud.basic.info.persistence.repository.UserRepository;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Query;
import com.zcloud.gbscommon.utils.Tools;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -113,10 +115,14 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
}
@Override
public void addCorpUser(CorpInfoE examTypeE) {
public void addCorpUser(UserE userE) {
UserDO userDo = new UserDO();
BeanUtils.copyProperties(examTypeE, userDo);
BeanUtils.copyProperties(userE, userDo);
if(userDo.getUserId()==null){
userDo.setUserId(Tools.get32UUID());
}
save(userDo);
userE.setId(userDo.getId());
}
}