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
787ca643
You need to sign in or sign up before continuing.
Commit
787ca643
authored
Jul 05, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
parent
c701442a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
13 deletions
+12
-13
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+2
-1
EmployeeExportVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
+8
-8
EmployeeVO.java
...a/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
+0
-2
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
787ca643
...
@@ -244,8 +244,9 @@ public class TEmployeeInfo extends BaseEntity {
...
@@ -244,8 +244,9 @@ public class TEmployeeInfo extends BaseEntity {
/**
/**
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
*/
*/
@Schema
(
description
=
"人员档案来源(字典:
4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬
)"
)
@Schema
(
description
=
"人员档案来源(字典:
1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
)"
)
private
String
fileSource
;
private
String
fileSource
;
/**
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
View file @
787ca643
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
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.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
...
@@ -55,9 +56,11 @@ public class EmployeeExportVO extends BaseEntity {
...
@@ -55,9 +56,11 @@ public class EmployeeExportVO extends BaseEntity {
private
String
empIdcard
;
private
String
empIdcard
;
@ExcelProperty
(
value
=
"身份证开始日期"
)
@ExcelProperty
(
value
=
"身份证开始日期"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
private
LocalDateTime
validityStart
;
private
LocalDateTime
validityStart
;
@ExcelProperty
(
value
=
"身份证截止日期"
)
@ExcelProperty
(
value
=
"身份证截止日期"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
private
LocalDateTime
validityEnd
;
private
LocalDateTime
validityEnd
;
@ExcelAttribute
(
name
=
"婚姻状况"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_MARRIED
)
@ExcelAttribute
(
name
=
"婚姻状况"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_MARRIED
)
...
@@ -121,18 +124,21 @@ public class EmployeeExportVO extends BaseEntity {
...
@@ -121,18 +124,21 @@ public class EmployeeExportVO extends BaseEntity {
private
String
major
;
private
String
major
;
@ExcelProperty
(
value
=
"入学时间"
)
@ExcelProperty
(
value
=
"入学时间"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
private
LocalDateTime
admissionDate
;
private
LocalDateTime
admissionDate
;
@ExcelProperty
(
value
=
"毕业时间"
)
@ExcelProperty
(
value
=
"毕业时间"
)
@DateTimeFormat
(
"yyyy-MM-dd"
)
private
LocalDateTime
gradutionDate
;
private
LocalDateTime
gradutionDate
;
@ExcelProperty
(
value
=
"档案备注"
)
@ExcelProperty
(
value
=
"档案备注"
)
private
String
remark
;
private
String
remark
;
/**
/**
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 人员档案来源(字典:4档案新增、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 档案新建、批量导入、社保/公积金派单、商险派单、人员发薪
*/
*/
@ExcelAttribute
(
name
=
"人员档案来源"
,
readConverterExp
=
"1=社保
公积金,2=薪酬,3=商险,4=人员档案新建
"
)
@ExcelAttribute
(
name
=
"人员档案来源"
,
readConverterExp
=
"1=社保
、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
"
)
@ExcelProperty
(
value
=
"人员档案来源"
)
@ExcelProperty
(
value
=
"人员档案来源"
)
private
String
fileSource
;
private
String
fileSource
;
...
@@ -183,12 +189,6 @@ public class EmployeeExportVO extends BaseEntity {
...
@@ -183,12 +189,6 @@ public class EmployeeExportVO extends BaseEntity {
@ExcelProperty
(
value
=
"近3个月发薪"
)
@ExcelProperty
(
value
=
"近3个月发薪"
)
private
String
salaryStatus
;
private
String
salaryStatus
;
@ExcelProperty
(
value
=
"创建人"
)
private
String
createName
;
@ExcelProperty
(
value
=
"创建时间"
)
private
LocalDateTime
proCreateTime
;
@ExcelProperty
(
value
=
"减档操作人"
)
@ExcelProperty
(
value
=
"减档操作人"
)
private
String
leaveUserName
;
private
String
leaveUserName
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeVO.java
View file @
787ca643
...
@@ -21,7 +21,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
...
@@ -21,7 +21,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
javax.validation.constraints.Max
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -42,7 +41,6 @@ public class EmployeeVO implements Serializable {
...
@@ -42,7 +41,6 @@ public class EmployeeVO implements Serializable {
/**
/**
* 员工类型(字典值,0外包1派遣2代理)
* 员工类型(字典值,0外包1派遣2代理)
*/
*/
@NotNull
(
message
=
"员工类型不能为空"
)
@ExcelProperty
(
value
=
"员工类型"
)
@ExcelProperty
(
value
=
"员工类型"
)
private
String
empNatrue
;
private
String
empNatrue
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
787ca643
...
@@ -993,7 +993,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -993,7 +993,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp
.
setDeptNo
(
excel
.
getDeptNo
());
saveEmp
.
setDeptNo
(
excel
.
getDeptNo
());
}
}
}
}
this
.
setBaseData
(
saveEmp
,
CommonConstants
.
dingleDigitStrArray
[
4
],
user
);
this
.
setBaseData
(
saveEmp
,
CommonConstants
.
dingleDigitStrArray
[
5
],
user
);
saveList
.
add
(
saveEmp
);
saveList
.
add
(
saveEmp
);
}
}
// 数据合法情况
// 数据合法情况
...
@@ -1012,7 +1012,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -1012,7 +1012,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
/**
/**
* @Description: // 字典:
4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬
* @Description: // 字典:
1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
* @Description: 加载初始数据
* @Description: 加载初始数据
* @Author: hgw
* @Author: hgw
* @Date: 2022/6/22 20:21
* @Date: 2022/6/22 20:21
...
...
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