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
44935282
Commit
44935282
authored
Aug 17, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
划转和减项判断社保公积金状态修改
parent
dc08e148
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+4
-0
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+12
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
44935282
...
@@ -29,6 +29,7 @@ import javax.validation.constraints.NotNull;
...
@@ -29,6 +29,7 @@ import javax.validation.constraints.NotNull;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
/**
/**
* 项目档案表
* 项目档案表
...
@@ -364,5 +365,8 @@ public class TEmployeeProject extends BaseEntity {
...
@@ -364,5 +365,8 @@ public class TEmployeeProject extends BaseEntity {
@Schema
(
description
=
"员工类型多个"
)
@Schema
(
description
=
"员工类型多个"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
[]
empNatureArray
;
private
String
[]
empNatureArray
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"选中的idList"
)
private
List
<
String
>
idList
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
44935282
...
@@ -19,8 +19,10 @@ package com.yifu.cloud.plus.v1.yifu.archives.vo;
...
@@ -19,8 +19,10 @@ 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.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.baomidou.mybatisplus.annotation.TableField
;
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
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
javax.validation.constraints.Past
;
import
javax.validation.constraints.Past
;
...
@@ -428,5 +430,15 @@ public class EmployeeProjectExportVO{
...
@@ -428,5 +430,15 @@ public class EmployeeProjectExportVO{
@ExcelProperty
(
value
=
"社保所在县"
)
@ExcelProperty
(
value
=
"社保所在县"
)
private
String
socialTown
;
private
String
socialTown
;
private
String
[]
socialStatusArray
;
private
String
[]
fundStatusArray
;
private
String
[]
insuranceStatusArray
;
private
String
[]
contractStatusArray
;
private
String
[]
empNatureArray
;
private
List
<
String
>
idList
;
private
List
<
String
>
idList
;
}
}
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