Commit 1605e233 authored by hongguangwu's avatar hongguangwu

MVP1.7.0 更新附件

parent 8a3a269c
...@@ -568,22 +568,26 @@ public class TEmployeeInfo extends BaseEntity { ...@@ -568,22 +568,26 @@ public class TEmployeeInfo extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private List<TEmpOtherFile> otherFiles; private List<TEmpOtherFile> otherFiles;
// 员工声明
@TableField(exist = false)
private TPreEmpDeclaration tPreEmpDeclaration;
// 档案编辑的其他附件之外的附件,例如:身份证正反面,户口本2页、员工声明、员工确认 // 档案编辑的其他附件之外的附件,例如:身份证正反面,户口本2页、员工声明、员工确认
@TableField(exist = false) @TableField(exist = false)
private List<TAttaInfo> attaList; private List<TAttaInfo> attaList;
// 档案编辑的其他附件之外的附件,例如:身份证正反面,户口本2页、员工声明、员工确认 // 档案编辑的其他附件之外的附件,例如:身份证正反面,户口本2页、员工声明、员工确认
// 身份证 // 身份证9\24
@TableField(exist = false) @TableField(exist = false)
private TAttaInfo attaIdCardOne; private TAttaInfo attaIdCardOne;
@TableField(exist = false) @TableField(exist = false)
private TAttaInfo attaIdCardTwo; private TAttaInfo attaIdCardTwo;
// 户口本 // 户口本10\25
@TableField(exist = false) @TableField(exist = false)
private TAttaInfo attaRegistrationOne; private TAttaInfo attaRegistrationOne;
@TableField(exist = false) @TableField(exist = false)
private TAttaInfo attaRegistrationTwo; private TAttaInfo attaRegistrationTwo;
// 员工声明 // 员工声明21\25
@TableField(exist = false) @TableField(exist = false)
private TAttaInfo attaDeclearOne; private TAttaInfo attaDeclearOne;
@TableField(exist = false) @TableField(exist = false)
......
...@@ -38,6 +38,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants; ...@@ -38,6 +38,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractAuditMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractAuditMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TPreEmpDeclarationMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.*; import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
...@@ -109,6 +110,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -109,6 +110,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private final TEmpOtherFileService empOtherFileService; private final TEmpOtherFileService empOtherFileService;
private final TPreEmpDeclarationMapper declarationMapper;
@Autowired @Autowired
private OSSUtil ossUtil; private OSSUtil ossUtil;
...@@ -2906,6 +2909,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2906,6 +2909,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isEmpty(employeeInfo)){ if (Common.isEmpty(employeeInfo)){
return R.failed(CommonConstants.NO_DATA_TO_HANDLE); return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
} }
TPreEmpDeclaration tPreEmpDeclaration = declarationMapper.getTPreEmpDeclarationList();
employeeInfo.setTPreEmpDeclaration(tPreEmpDeclaration);
getAttaInfo(employeeInfo); getAttaInfo(employeeInfo);
getEmpAttaInfo(employeeInfo); getEmpAttaInfo(employeeInfo);
return R.ok(employeeInfo); return R.ok(employeeInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment