Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
5668f0a8
Commit
5668f0a8
authored
Jul 03, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huyc 项目档案代码提交
parent
bdf116c8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
186 additions
and
104 deletions
+186
-104
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+28
-3
EmployeeProjectVO.java
...ifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectVO.java
+6
-4
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+10
-5
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+5
-5
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+137
-87
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
5668f0a8
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
lombok.Data
;
import
javax.validation.constraints.Past
;
...
...
@@ -42,7 +43,7 @@ public class EmployeeProjectExportVO{
* 档案员工类型(字典值,0外包1派遣2代理)
*/
@ExcelProperty
(
value
=
"档案员工类型"
)
@ExcelAttribute
(
name
=
"档案员工类型"
,
is
NotEmpty
=
true
,
errorInfo
=
"档案员工类型不可为空"
,
isDataId
=
true
,
dataType
=
"emp_natrue"
)
@ExcelAttribute
(
name
=
"档案员工类型"
,
is
DataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
private
String
proEmpNatrue
;
/**
...
...
@@ -79,18 +80,21 @@ public class EmployeeProjectExportVO{
* 婚姻状况
*/
@ExcelProperty
(
value
=
"婚姻状况"
)
@ExcelAttribute
(
name
=
"婚姻状况"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_MARRIED
)
private
String
empMarriStatus
;
/**
* 民族
*/
@ExcelProperty
(
value
=
"民族"
)
@ExcelAttribute
(
name
=
"民族"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATIONAL
)
private
String
empNational
;
/**
* 政治面貌
*/
@ExcelProperty
(
value
=
"政治面貌"
)
@ExcelAttribute
(
name
=
"政治面貌"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_POLITICAL
)
private
String
politicalStatus
;
/**
...
...
@@ -108,6 +112,7 @@ public class EmployeeProjectExportVO{
/**
* 身份证-省
*/
@ExcelAttribute
(
name
=
"户籍所在省"
,
isArea
=
true
)
@ExcelProperty
(
value
=
"户籍所在省"
)
private
String
idProvince
;
...
...
@@ -115,48 +120,56 @@ public class EmployeeProjectExportVO{
* 身份证-市
*/
@ExcelProperty
(
value
=
"户籍所在市"
)
@ExcelAttribute
(
name
=
"户籍所在市"
,
isArea
=
true
,
parentField
=
"idProvince"
)
private
String
idCity
;
/**
* 身份证-县
*/
@ExcelProperty
(
value
=
"户籍所在县"
)
@ExcelAttribute
(
name
=
"户籍所在县"
,
isArea
=
true
,
parentField
=
"idCity"
)
private
String
idTown
;
/**
* 户口性质
*/
@ExcelProperty
(
value
=
"户口性质"
)
@ExcelAttribute
(
name
=
"户口性质"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_REGISTYPE
)
private
String
empRegisType
;
/**
* 档案-省
*/
@ExcelProperty
(
value
=
"档案所在省"
)
@ExcelAttribute
(
name
=
"档案所在省"
,
isArea
=
true
)
private
String
fileProvince
;
/**
* 档案-市
*/
@ExcelProperty
(
value
=
"档案所在市"
)
@ExcelAttribute
(
name
=
"档案所在市"
,
isArea
=
true
,
parentField
=
"fileProvince"
)
private
String
fileCity
;
/**
* 档案-县
*/
@ExcelProperty
(
value
=
"档案所在县"
)
@ExcelAttribute
(
name
=
"档案所在县"
,
isArea
=
true
,
parentField
=
"fileCity"
)
private
String
fileTown
;
/**
* 是否大专及以上(0否1是)
*/
@ExcelProperty
(
value
=
"是否大专及以上"
)
@ExcelAttribute
(
name
=
"是否大专及以上"
,
readConverterExp
=
"0=否,1=是"
)
private
String
isCollege
;
/**
* 最高学历(字典值)
*/
@ExcelProperty
(
value
=
"最高学历"
)
@ExcelAttribute
(
name
=
"最高学历"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EDUCATION
)
private
String
hignEducation
;
/**
...
...
@@ -175,13 +188,13 @@ public class EmployeeProjectExportVO{
* 入学时间
*/
@ExcelProperty
(
value
=
"入学时间"
)
private
LocalDate
admissionDate
;
private
LocalDate
Time
admissionDate
;
/**
* 毕业时间
*/
@ExcelProperty
(
value
=
"毕业时间"
)
private
LocalDate
gradutionDate
;
private
LocalDate
Time
gradutionDate
;
/**
* 备注
...
...
@@ -193,18 +206,21 @@ public class EmployeeProjectExportVO{
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
*/
@ExcelProperty
(
value
=
"人员档案来源"
)
@ExcelAttribute
(
name
=
"人员档案来源"
,
readConverterExp
=
"1=社保公积金,2=薪酬,3=商险,4=人员档案新建"
)
private
String
fileSource
;
/**
* 人员档案状态(0草稿、1已审核)
*/
@ExcelProperty
(
value
=
"人员档案状态"
)
@ExcelAttribute
(
name
=
"人员档案状态"
,
readConverterExp
=
"0=草稿,1=已审核"
)
private
Integer
proStatus
;
/**
* 档案状态(0正常;1已减档)
*/
@ExcelProperty
(
value
=
"档案状态"
)
@ExcelAttribute
(
name
=
"人员档案状态"
,
readConverterExp
=
"0=正常,1=已减档"
)
private
Integer
fileStatus
;
/**
...
...
@@ -248,12 +264,14 @@ public class EmployeeProjectExportVO{
* 合同类型(字典值)
*/
@ExcelProperty
(
value
=
"合同类型"
)
@ExcelAttribute
(
name
=
"合同类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_CONTRACT_TYPE
)
private
String
contractType
;
/**
* 工时制
*/
@ExcelProperty
(
value
=
"工时制"
)
@ExcelAttribute
(
name
=
"工时制"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
WORKING_HOURS
)
private
String
workingHours
;
/**
...
...
@@ -279,6 +297,7 @@ public class EmployeeProjectExportVO{
* 项目员工类型
*/
@ExcelProperty
(
value
=
"项目员工类型"
)
@ExcelAttribute
(
name
=
"项目员工类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_STATE
)
private
String
empNatrue
;
/**
...
...
@@ -309,6 +328,7 @@ public class EmployeeProjectExportVO{
* 员工合同状态(字典)
*/
@ExcelProperty
(
value
=
"合同状态"
)
@ExcelAttribute
(
name
=
"合同状态"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_STATE
)
private
Integer
contractStatus
;
/**
...
...
@@ -333,30 +353,35 @@ public class EmployeeProjectExportVO{
* 商险状态(字典)
*/
@ExcelProperty
(
value
=
"商险状态"
)
@ExcelAttribute
(
name
=
"商险状态"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
COMMERCIAL_SATTE
)
private
Integer
insuranceStatus
;
/**
* 社保状态(字典)
*/
@ExcelProperty
(
value
=
"社保状态"
)
@ExcelAttribute
(
name
=
"社保状态"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
SOCIAL_ECURITY_STATE
)
private
Integer
socialStatus
;
/**
* 公积金状态(字典)
*/
@ExcelProperty
(
value
=
"公积金状态"
)
@ExcelAttribute
(
name
=
"公积金状态"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
FUND_STATUS
)
private
Integer
fundStatus
;
/**
* 近3个月发薪(0否;1是)
*/
@ExcelProperty
(
value
=
"近3个月发薪"
)
@ExcelAttribute
(
name
=
"近3个月发薪"
,
readConverterExp
=
"0=无,1=是,2=否"
)
private
Integer
salaryStatus
;
/**
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
*/
@ExcelProperty
(
value
=
"项目档案来源"
)
@ExcelAttribute
(
name
=
"项目档案来源"
,
readConverterExp
=
"1=社保/公积金,2=薪酬,3=商险,4=人员档案新建,5=项目档案新建"
)
private
String
projectSource
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectVO.java
View file @
5668f0a8
...
...
@@ -19,6 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
...
...
@@ -34,7 +35,7 @@ import java.time.LocalDate;
*/
@Data
@ColumnWidth
(
30
)
public
class
EmployeeProjectVO
implements
Serializable
{
public
class
EmployeeProjectVO
extends
RowIndex
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -42,7 +43,7 @@ public class EmployeeProjectVO implements Serializable {
* 员工类型(字典值,0外包1派遣2代理)
*/
@NotNull
(
message
=
"员工类型不能为空"
)
@ExcelAttribute
(
name
=
"员工类型"
,
isNotEmpty
=
true
,
errorInfo
=
"员工类型不能为空"
,
maxLength
=
1
)
@ExcelAttribute
(
name
=
"员工类型"
,
isNotEmpty
=
true
,
errorInfo
=
"员工类型不能为空"
,
maxLength
=
1
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_NATRUE
)
@ExcelProperty
(
value
=
"员工类型"
)
private
String
empNatrue
;
...
...
@@ -93,7 +94,7 @@ public class EmployeeProjectVO implements Serializable {
*/
@NotNull
(
message
=
"合同类型不能为空"
)
@ExcelProperty
(
value
=
"合同类型"
)
@ExcelAttribute
(
name
=
"合同类型"
,
isNotEmpty
=
true
,
errorInfo
=
"
项目编码不能为空"
,
maxLength
=
2
)
@ExcelAttribute
(
name
=
"合同类型"
,
isNotEmpty
=
true
,
errorInfo
=
"
合同类型不能为空"
,
maxLength
=
2
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMPLOYEE_CONTRACT_TYPE
)
private
String
contractType
;
/**
...
...
@@ -101,7 +102,7 @@ public class EmployeeProjectVO implements Serializable {
*/
@NotNull
(
message
=
"工时制不能为空"
)
@ExcelProperty
(
value
=
"工时制"
)
@ExcelAttribute
(
name
=
"工时制"
,
isNotEmpty
=
true
,
errorInfo
=
"工时制不能为空"
,
maxLength
=
1
)
@ExcelAttribute
(
name
=
"工时制"
,
isNotEmpty
=
true
,
errorInfo
=
"工时制不能为空"
,
maxLength
=
1
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
WORKING_HOURS
)
private
String
workingHours
;
/**
...
...
@@ -125,6 +126,7 @@ public class EmployeeProjectVO implements Serializable {
*/
@ExcelProperty
(
value
=
"试用期"
)
@NotNull
(
message
=
"试用期不能为空"
)
@ExcelAttribute
(
name
=
"试用期"
,
isNotEmpty
=
true
,
errorInfo
=
"试用期不能为空"
,
maxLength
=
2
)
private
String
tryPeriod
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
5668f0a8
...
...
@@ -21,23 +21,26 @@ import com.alibaba.fastjson.JSONObject;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.pig4cloud.plugin.excel.annotation.RequestExcel
;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.SneakyThrows
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.validation.BindingResult
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.validation.Valid
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -198,12 +201,13 @@ public class TEmployeeProjectController {
* @Author huyc
* @Date 2022-06-20
**/
@SneakyThrows
@Operation
(
description
=
"批量新增项目档案信息 hasPermission('wxhr:employeeProjectinfo_importListAdd')"
)
@SysLog
(
"批量新增项目档案信息"
)
@PostMapping
(
"/importListAdd"
)
@PreAuthorize
(
"@pms.hasPermission('wxhr:employeeProjectinfo_importListAdd')"
)
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@Request
Excel
List
<
EmployeeProjectVO
>
excelVOList
,
BindingResult
bindingResult
,
@RequestParam
(
"idAdd"
)
String
idAdd
)
{
return
tEmployeeProjectService
.
importListAdd
(
excelVOList
,
bindingResult
,
idAdd
);
public
R
<
List
<
ErrorMessage
>>
importListAdd
(
@Request
Body
MultipartFile
file
,
@RequestParam
(
"idAdd"
)
String
idAdd
)
throws
IOException
{
return
tEmployeeProjectService
.
importListAdd
(
file
.
getInputStream
()
,
idAdd
);
}
/**
...
...
@@ -214,12 +218,13 @@ public class TEmployeeProjectController {
* @Author huyc
* @Date 2022-06-21
**/
@SneakyThrows
@Operation
(
description
=
"批量更新项目档案信息 hasPermission('archives_project_importListUpdate')"
)
@SysLog
(
"批量更新项目档案信息"
)
@PostMapping
(
"/importListUpate"
)
@PreAuthorize
(
"@pms.hasPermission('archives_project_importListUpdate')"
)
public
R
<
List
<
ErrorMessage
>>
importListUpate
(
@Request
Excel
List
<
EmployeeProjectVO
>
excelVOList
,
BindingResult
bindingResult
)
{
return
tEmployeeProjectService
.
importEmpProjectUpdate
(
excelVOList
,
bindingResult
);
public
R
<
List
<
ErrorMessage
>>
importListUpate
(
@Request
Body
MultipartFile
file
)
{
return
tEmployeeProjectService
.
importEmpProjectUpdate
(
file
.
getInputStream
()
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
5668f0a8
...
...
@@ -21,15 +21,16 @@ import com.alibaba.fastjson.JSONObject;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.pig4cloud.plugin.excel.vo.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
org.springframework.validation.BindingResult
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -66,15 +67,14 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
R
<
List
<
ErrorMessage
>>
batchDeleteEmpPro
(
List
<
EmployeeProjectVO
>
list
,
BindingResult
bindingResult
);
/**
* @param excelVOList
* @param bindingResult
* @param inputStream
* @param isAdd
* @Description: 批量新增项目档案
* @Author: huyc
* @Date: 2022/6/21 10:30
* @return: R
**/
R
<
List
<
ErrorMessage
>>
importListAdd
(
List
<
EmployeeProjectVO
>
excelVOList
,
BindingResult
bindingResult
,
String
isAdd
);
R
<
List
<
ErrorMessage
>>
importListAdd
(
InputStream
inputStream
,
String
isAdd
);
/**
* @param projectStatus 传0才过滤
...
...
@@ -104,7 +104,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
* @Date: 2022/6/21 10:30
* @return: R
**/
R
<
List
<
ErrorMessage
>>
importEmpProjectUpdate
(
List
<
EmployeeProjectVO
>
excelVOList
,
BindingResult
bindingResult
);
R
<
List
<
ErrorMessage
>>
importEmpProjectUpdate
(
InputStream
inputStream
);
/**
* @param ids
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
5668f0a8
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment