Commit ab96a8c0 authored by huyuchen's avatar huyuchen

huych-入离职登记增加附件和姓名身份证和手机号校验

parent e532d06b
...@@ -42,11 +42,5 @@ ...@@ -42,11 +42,5 @@
<version>1.0.0</version> <version>1.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.yifu.cloud.plus.v1</groupId>
<artifactId>yifu-csp-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -123,6 +123,7 @@ public class EmployeeRegistrationPre extends BaseEntity { ...@@ -123,6 +123,7 @@ public class EmployeeRegistrationPre extends BaseEntity {
private List<TEmployeeInsurancePre> insurancePreList; private List<TEmployeeInsurancePre> insurancePreList;
@Schema(description = "附件集合") @Schema(description = "附件集合")
@TableField(exist = false)
private List<TAttaInfo> attaList; private List<TAttaInfo> attaList;
/** /**
......
...@@ -2,7 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo; ...@@ -2,7 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.csp.entity.TCspAttaInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreVo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -125,6 +125,6 @@ public class EmployeeRegistrationPreVo implements Serializable { ...@@ -125,6 +125,6 @@ public class EmployeeRegistrationPreVo implements Serializable {
private List<TEmployeeInsurancePreVo> employeeInsurancePreVos; private List<TEmployeeInsurancePreVo> employeeInsurancePreVos;
@Schema(description = "附件集合") @Schema(description = "附件集合")
private List<TCspAttaInfo> attaList; private List<TAttaInfo> attaList;
} }
...@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.csp.entity.TCspAttaInfo;
import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo; import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationUpdateVo;
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.EmployeeRegistrationPreMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.EmployeeRegistrationPreMapper;
...@@ -269,14 +268,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -269,14 +268,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
baseMapper.insert(pre); baseMapper.insert(pre);
//附件赋值 //附件赋值
if (Common.isNotNull(preVo.getAttaList())) { if (Common.isNotNull(preVo.getAttaList())) {
for (TCspAttaInfo cspAttaInfo : preVo.getAttaList()) { for (TAttaInfo attaInfo : preVo.getAttaList()) {
TAttaInfo attaInfo = new TAttaInfo();
BeanUtils.copyProperties(cspAttaInfo,attaInfo);
if (CommonConstants.ONE_STRING.equals(cspAttaInfo.getRelationType())) {
attaInfo.setRelationType("30");
} else if (CommonConstants.TWO_STRING.equals(cspAttaInfo.getRelationType())) {
attaInfo.setRelationType("31");
}
attaInfo.setDomainId(pre.getId()); attaInfo.setDomainId(pre.getId());
attaInfoService.save(attaInfo); attaInfoService.save(attaInfo);
} }
......
package com.yifu.cloud.plus.v1.csp.controller; package com.yifu.cloud.plus.v1.csp.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.csp.entity.TCspAttaInfo;
import com.yifu.cloud.plus.v1.csp.service.FileUploadService; import com.yifu.cloud.plus.v1.csp.service.FileUploadService;
import com.yifu.cloud.plus.v1.csp.service.TAttaInfoService; import com.yifu.cloud.plus.v1.csp.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryAttaVo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -20,7 +19,6 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -20,7 +19,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -96,7 +94,7 @@ public class FileUploadController { ...@@ -96,7 +94,7 @@ public class FileUploadController {
@DeleteMapping("/ossFileDelete/{id}") @DeleteMapping("/ossFileDelete/{id}")
public R<Boolean> ossFileDelete(@PathVariable String id) { public R<Boolean> ossFileDelete(@PathVariable String id) {
try { try {
TAttaInfo attaInfo = tAttaInfoService.getById(id); TCspAttaInfo attaInfo = tAttaInfoService.getById(id);
if (null == attaInfo) { if (null == attaInfo) {
return R.failed("无对应附件信息"); return R.failed("无对应附件信息");
} }
...@@ -123,42 +121,16 @@ public class FileUploadController { ...@@ -123,42 +121,16 @@ public class FileUploadController {
**/ **/
@Operation(description = "附件预览下载地址 type:关系类型(1 入离职登记身份证正面 2.入离职登记身份证反面 3.离职登记") @Operation(description = "附件预览下载地址 type:关系类型(1 入离职登记身份证正面 2.入离职登记身份证反面 3.离职登记")
@GetMapping("/ossFileUrl/{id}") @GetMapping("/ossFileUrl/{id}")
public R<List<TAttaInfo>> ossFileUrl(@PathVariable String id) { public R<List<TCspAttaInfo>> ossFileUrl(@PathVariable String id) {
List<TAttaInfo> attas = tAttaInfoService.list(Wrappers.<TAttaInfo>query().lambda().eq(TAttaInfo::getDomainId,id)); List<TCspAttaInfo> attas = tAttaInfoService.list(Wrappers.<TCspAttaInfo>query().lambda().eq(TCspAttaInfo::getDomainId,id));
if (Common.isEmpty(attas)) { if (Common.isEmpty(attas)) {
return new R<>(attas); return new R<>(attas);
} }
for (TAttaInfo atta:attas){ for (TCspAttaInfo atta:attas){
URL url = ossUtil.getObjectUrl(null, atta.getAttaSrc()); URL url = ossUtil.getObjectUrl(null, atta.getAttaSrc());
atta.setAttaUrl(url.toString().replace("http","https")); atta.setAttaUrl(url.toString().replace("http","https"));
} }
return new R<>(attas); return new R<>(attas);
} }
/**
* 获取附件
* @author hgw
* @return R
*/
@Operation(summary = "获取薪资原表附件--EKP调用接口", description = "获取薪资原表附件--EKP调用接口")
@SysLog("获取薪资原表附件--EKP调用接口")
@GetMapping("/getAttaListBySalaryId")
public R<List<SalaryAttaVo>> getAttaListBySalaryId(@RequestParam String salaryId) {
List<SalaryAttaVo> voList = new ArrayList<>();
List<TAttaInfo> attaList = tAttaInfoService.list(Wrappers.<TAttaInfo>query().lambda()
.eq(TAttaInfo::getRelationType,11)
.eq(TAttaInfo::getDomainId,salaryId));
if (attaList != null && !attaList.isEmpty()) {
SalaryAttaVo vo;
URL url;
for (TAttaInfo a : attaList){
url = ossUtil.getObjectUrl(null, a.getAttaSrc());
vo = new SalaryAttaVo();
vo.setAttaName(a.getAttaName());
vo.setAttaUrl(url.toString().replace("http","https"));
voList.add(vo);
}
}
return R.ok(voList);
}
} }
package com.yifu.cloud.plus.v1.csp.service; package com.yifu.cloud.plus.v1.csp.service;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo; import com.yifu.cloud.plus.v1.csp.entity.TCspAttaInfo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo; import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo;
import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.formula.functions.T;
...@@ -18,7 +18,7 @@ public interface FileUploadService { ...@@ -18,7 +18,7 @@ public interface FileUploadService {
R<FileVo> uploadImg(MultipartFile file, String filePath, Integer type, String domain) throws IOException; R<FileVo> uploadImg(MultipartFile file, String filePath, Integer type, String domain) throws IOException;
R<TAttaInfo> uploadFileReturnAtta(MultipartFile file, String filePath, Integer type, String domainId) throws IOException; R<TCspAttaInfo> uploadFileReturnAtta(MultipartFile file, String filePath, Integer type, String domainId) throws IOException;
R<T> uploadAsso(MultipartFile file, String filePath, Integer type, String domain, String uploadType); R<T> uploadAsso(MultipartFile file, String filePath, Integer type, String domain, String uploadType);
} }
...@@ -26,6 +26,7 @@ import com.yifu.cloud.plus.v1.csp.vo.*; ...@@ -26,6 +26,7 @@ import com.yifu.cloud.plus.v1.csp.vo.*;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser; import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo; import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem; import com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept;
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.ClientNameConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
...@@ -46,6 +47,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo; ...@@ -46,6 +47,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsuranceSelectVo;
import com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TEmployeeInsuranceWorkDayVo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -1280,7 +1282,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1280,7 +1282,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//附件赋值 //附件赋值
List<TCspAttaInfo> attaInfoList = tAttaInfoService.list(Wrappers.<TCspAttaInfo>query().lambda().eq(TCspAttaInfo::getDomainId, registration.getId())); List<TCspAttaInfo> attaInfoList = tAttaInfoService.list(Wrappers.<TCspAttaInfo>query().lambda().eq(TCspAttaInfo::getDomainId, registration.getId()));
if (attaInfoList != null && !attaInfoList.isEmpty()) { if (attaInfoList != null && !attaInfoList.isEmpty()) {
preVo.setAttaList(attaInfoList); List<TAttaInfo> attaInfos = new ArrayList<>();
for (TCspAttaInfo cspAttaInfo : attaInfoList) {
TAttaInfo attaInfo = new TAttaInfo();
BeanUtils.copyProperties(cspAttaInfo,attaInfo);
if (CommonConstants.ONE_STRING.equals(cspAttaInfo.getRelationType())) {
attaInfo.setRelationType("30");
} else if (CommonConstants.TWO_STRING.equals(cspAttaInfo.getRelationType())) {
attaInfo.setRelationType("31");
}
attaInfo.setDomainId(preVo.getId());
attaInfos.add(attaInfo);
}
preVo.setAttaList(attaInfos);
} }
} }
......
package com.yifu.cloud.plus.v1.csp.service.impl; package com.yifu.cloud.plus.v1.csp.service.impl;
import com.yifu.cloud.plus.v1.csp.entity.TCspAttaInfo;
import com.yifu.cloud.plus.v1.csp.mapper.SysConfigLimitMapper; import com.yifu.cloud.plus.v1.csp.mapper.SysConfigLimitMapper;
import com.yifu.cloud.plus.v1.csp.service.FileUploadService; import com.yifu.cloud.plus.v1.csp.service.FileUploadService;
import com.yifu.cloud.plus.v1.csp.service.TAttaInfoService; import com.yifu.cloud.plus.v1.csp.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
...@@ -44,7 +44,7 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -44,7 +44,7 @@ public class FileUploadServiceImpl implements FileUploadService {
private final SysConfigLimitMapper configLimitMapper; private final SysConfigLimitMapper configLimitMapper;
@Override @Override
public R<TAttaInfo> uploadFileReturnAtta(MultipartFile file, String filePath, Integer type, String domainId) throws IOException { public R<TCspAttaInfo> uploadFileReturnAtta(MultipartFile file, String filePath, Integer type, String domainId) throws IOException {
if (null == file) { if (null == file) {
return R.failed("文件删除异常,请重新上传!"); return R.failed("文件删除异常,请重新上传!");
} }
...@@ -67,7 +67,7 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -67,7 +67,7 @@ public class FileUploadServiceImpl implements FileUploadService {
return R.failed("非法上传类型:"+fileName); return R.failed("非法上传类型:"+fileName);
} }
boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null); boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null);
TAttaInfo attaInfo; TCspAttaInfo attaInfo;
URL url; URL url;
if (flag) { if (flag) {
log.info("文件:" + fileName + "上传到存储空间" + ossUtil.getBucketName() + "成功!"); log.info("文件:" + fileName + "上传到存储空间" + ossUtil.getBucketName() + "成功!");
...@@ -127,7 +127,7 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -127,7 +127,7 @@ public class FileUploadServiceImpl implements FileUploadService {
} }
boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null); boolean flag = ossUtil.uploadFileByStream(file.getInputStream(), key, null);
FileVo fileVo; FileVo fileVo;
TAttaInfo attaInfo; TCspAttaInfo attaInfo;
URL url; URL url;
if (flag) { if (flag) {
log.info("文件:" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功!"); log.info("文件:" + fileName + "上传至存储空间" + ossUtil.getBucketName() + "成功!");
...@@ -167,7 +167,7 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -167,7 +167,7 @@ public class FileUploadServiceImpl implements FileUploadService {
String key = System.currentTimeMillis() + fileName; String key = System.currentTimeMillis() + fileName;
boolean flag = ossUtil.uploadFileByStream(fileIn, key, null); boolean flag = ossUtil.uploadFileByStream(fileIn, key, null);
FileVo fileVo; FileVo fileVo;
TAttaInfo attaInfo; TCspAttaInfo attaInfo;
URL url; URL url;
if (flag) { if (flag) {
attaInfo = initUnitAttaForInsert(fileName, key, 0); attaInfo = initUnitAttaForInsert(fileName, key, 0);
...@@ -201,8 +201,8 @@ public class FileUploadServiceImpl implements FileUploadService { ...@@ -201,8 +201,8 @@ public class FileUploadServiceImpl implements FileUploadService {
* @param fileSize * @param fileSize
* @return * @return
*/ */
private TAttaInfo initUnitAttaForInsert(String fileName, String key, long fileSize) { private TCspAttaInfo initUnitAttaForInsert(String fileName, String key, long fileSize) {
TAttaInfo unitAtta = new TAttaInfo(); TCspAttaInfo unitAtta = new TCspAttaInfo();
char slash = '/'; char slash = '/';
char point = '.'; char point = '.';
if (fileName.lastIndexOf(slash) >= 0) { if (fileName.lastIndexOf(slash) >= 0) {
......
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