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
50f5d489
Commit
50f5d489
authored
Jun 02, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :bug修复
parent
3800e9f1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
28 deletions
+29
-28
TEmployeeRetirement.java
...oud/plus/v1/yifu/archives/entity/TEmployeeRetirement.java
+5
-5
TEmployeeRetirementExportVo.java
...plus/v1/yifu/archives/vo/TEmployeeRetirementExportVo.java
+21
-20
TEmployeeRetirementMapper.xml
...z/src/main/resources/mapper/TEmployeeRetirementMapper.xml
+3
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeRetirement.java
View file @
50f5d489
...
...
@@ -48,8 +48,8 @@ public class TEmployeeRetirement extends BaseEntity implements Serializable {
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"身份证号码"
)
@ExcelAttribute
(
name
=
"身份证号
码
"
)
@Schema
(
description
=
"身份证号
码
"
)
@ExcelAttribute
(
name
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
/**
...
...
@@ -173,9 +173,9 @@ public class TEmployeeRetirement extends BaseEntity implements Serializable {
* 项目编码
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"
客户
编码"
)
@ExcelAttribute
(
name
=
"
客户
编码"
)
@Schema
(
description
=
"
客户
编码"
)
@ExcelProperty
(
"
项目
编码"
)
@ExcelAttribute
(
name
=
"
项目
编码"
)
@Schema
(
description
=
"
项目
编码"
)
private
String
deptNo
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeRetirementExportVo.java
View file @
50f5d489
...
...
@@ -44,9 +44,9 @@ public class TEmployeeRetirementExportVo{
* 身份证号码
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"身份证号
码
"
)
@ExcelAttribute
(
name
=
"身份证号
码
"
)
@Schema
(
description
=
"身份证号
码
"
)
@ExcelProperty
(
"身份证号"
)
@ExcelAttribute
(
name
=
"身份证号"
)
@Schema
(
description
=
"身份证号"
)
private
String
empIdcard
;
/**
...
...
@@ -71,9 +71,9 @@ public class TEmployeeRetirementExportVo{
* 年龄
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"年龄"
)
@ExcelAttribute
(
name
=
"年龄"
)
@Schema
(
description
=
"年龄"
)
@ExcelProperty
(
"年龄
(岁)
"
)
@ExcelAttribute
(
name
=
"年龄
(岁)
"
)
@Schema
(
description
=
"年龄
(岁)
"
)
private
Integer
empAge
;
/**
...
...
@@ -87,15 +87,15 @@ public class TEmployeeRetirementExportVo{
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"档案"
)
@ExcelAttribute
(
name
=
"档案"
)
@Schema
(
description
=
"档案"
)
@ExcelProperty
(
"档案
所在地
"
)
@ExcelAttribute
(
name
=
"档案
所在地
"
)
@Schema
(
description
=
"档案
所在地
"
)
private
String
fileAddress
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保"
)
@ExcelAttribute
(
name
=
"社保"
)
@Schema
(
description
=
"社保"
)
@ExcelProperty
(
"社保
所在地
"
)
@ExcelAttribute
(
name
=
"社保
所在地
"
)
@Schema
(
description
=
"社保
所在地
"
)
private
String
socialAddress
;
...
...
@@ -137,14 +137,7 @@ public class TEmployeeRetirementExportVo{
@Schema
(
description
=
"社保-县"
)
private
Integer
socialTown
;
/**
* 项目名称
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"项目名称"
)
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
/**
* 客户名称
...
...
@@ -164,6 +157,14 @@ public class TEmployeeRetirementExportVo{
@Schema
(
description
=
"客户编码"
)
private
String
unitNo
;
/**
* 项目名称
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"项目名称"
)
@ExcelAttribute
(
name
=
"项目名称"
)
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
/**
* 项目编码
*/
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml
View file @
50f5d489
...
...
@@ -18,9 +18,9 @@
<result
property=
"socialProvince"
column=
"SOCIAL_PROVINCE"
jdbcType=
"INTEGER"
/>
<result
property=
"socialCity"
column=
"SOCIAL_CITY"
jdbcType=
"INTEGER"
/>
<result
property=
"socialTown"
column=
"SOCIAL_TOWN"
jdbcType=
"INTEGER"
/>
<result
property=
"deptName"
column=
"DEPT_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"unitName"
column=
"UNIT_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"unitNo"
column=
"UNIT_NO"
jdbcType=
"VARCHAR"
/>
<result
property=
"deptName"
column=
"DEPT_NAME"
jdbcType=
"VARCHAR"
/>
<result
property=
"deptNo"
column=
"DEPT_NO"
jdbcType=
"VARCHAR"
/>
<result
property=
"handleFlag"
column=
"HANDLE_FLAG"
jdbcType=
"INTEGER"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
jdbcType=
"VARCHAR"
/>
...
...
@@ -35,8 +35,8 @@
EMP_PHONE,EMP_SEX,EMP_AGE,
EMP_NATRUE,FILE_PROVINCE,FILE_CITY,
FILE_TOWN,SOCIAL_PROVINCE,SOCIAL_CITY,
SOCIAL_TOWN,
DEPT_NAME,
UNIT_NAME,
UNIT_NO,DEPT_NO,HANDLE_FLAG,
SOCIAL_TOWN,UNIT_NAME,
UNIT_NO,DEPT_N
AME,DEPT_N
O,HANDLE_FLAG,
CREATE_BY,CREATE_NAME,CREATE_TIME,
UPDATE_BY,UPDATE_TIME
</sql>
...
...
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