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
65dee890
Commit
65dee890
authored
Sep 26, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
人员档案,项目档案,预入职档案 导出添加通信地址省市县-fxj
parent
86274d7a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
84 additions
and
7 deletions
+84
-7
EmployeeExportVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
+22
-1
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+23
-3
TPreMainExportAllVO.java
...u/cloud/plus/v1/yifu/archives/vo/TPreMainExportAllVO.java
+6
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+9
-0
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+11
-1
TPreEmpMainMapper.xml
...hives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
+10
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
View file @
65dee890
...
...
@@ -249,11 +249,32 @@ public class EmployeeExportVO extends BaseEntity {
@ExcelProperty
(
value
=
"减档备注"
)
private
String
leaveRemark
;
/**
* 通信地址省 2024-09-26 fxj 导出添加
*/
@ExcelAttribute
(
name
=
"通信地址-省"
,
isArea
=
true
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址-省"
)
private
String
contactProvince
;
/**
* 通信地址市
*/
@ExcelAttribute
(
name
=
"通信地址-市"
,
isArea
=
true
,
parentField
=
"contactProvince"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址-市"
)
private
String
contactCity
;
/**
* 通信地址县
*/
@ExcelAttribute
(
name
=
"通信地址-区/县"
,
isArea
=
true
,
parentField
=
"contactCity"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址-区/县"
)
private
String
contactTown
;
/**
* 通信地址
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"通信地址"
)
@ExcelProperty
(
value
=
"通信地址
-详细地址
"
)
private
String
contactAddress
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
65dee890
...
...
@@ -440,13 +440,33 @@ public class EmployeeProjectExportVO {
@ExcelProperty
(
value
=
"项目档案来源"
)
@ExcelAttribute
(
name
=
"项目档案来源"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PROJECT_EMP_SOURCE
)
private
String
projectSource
;
/**
* 通信地址省 2024-09-26 fxj 导出添加
*/
@ExcelAttribute
(
name
=
"通信地址-省"
,
isArea
=
true
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址-省"
)
private
String
contactProvince
;
/**
* 通信地址市
*/
@ExcelAttribute
(
name
=
"通信地址-市"
,
isArea
=
true
,
parentField
=
"contactProvince"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址-市"
)
private
String
contactCity
;
/**
* 通信地址县
*/
@ExcelAttribute
(
name
=
"通信地址-区/县"
,
isArea
=
true
,
parentField
=
"contactCity"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"通信地址-区/县"
)
private
String
contactTown
;
/**
* 通信地址
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"通信地址"
)
@ExcelAttribute
(
name
=
"通信地址"
)
@ExcelProperty
(
value
=
"通信地址
-详细地址
"
)
@ExcelAttribute
(
name
=
"通信地址
-详细地址
"
)
private
String
contactAddress
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPreMainExportAllVO.java
View file @
65dee890
...
...
@@ -82,6 +82,12 @@ public class TPreMainExportAllVO {
private
String
field20
;
@ExcelProperty
(
value
=
"档案状态"
)
private
String
field21
;
@ExcelProperty
(
value
=
"通信地址-省"
)
private
String
field66
;
@ExcelProperty
(
value
=
"通信地址-市"
)
private
String
field67
;
@ExcelProperty
(
value
=
"通信地址-区/县"
)
private
String
field68
;
@ExcelProperty
(
value
=
"通信地址"
)
private
String
field22
;
@ExcelProperty
(
value
=
"客户名称"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
65dee890
...
...
@@ -2245,6 +2245,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"户口性质"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"档案所在地"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"档案状态"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"通信地址-省"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"通信地址-市"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"通信地址-区/县"
}));
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"通信地址"
}));
oneTitle
=
"在项信息"
;
headList
.
add
(
this
.
getNewArrayList
(
new
String
[]{
oneTitle
,
"客户名称"
}));
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
65dee890
...
...
@@ -131,6 +131,9 @@
<result
property=
"salaryStatus"
column=
"SALARY_STATUS"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactAddress"
column=
"CONTACT_ADDRESS"
/>
<result
property=
"unitName"
column=
"UNIT_NAME"
/>
...
...
@@ -1052,6 +1055,9 @@
CASE WHEN a.`STATUS`=0 THEN "草稿"
WHEN a.`STATUS` =1 THEN "已审核"
ELSE a.`STATUS` END as "STATUS", # 0=草稿,1=已审核
a7.AREA_NAME as "CONTACT_PROVINCE",
a8.AREA_NAME as "CONTACT_CITY",
a9.AREA_NAME as "CONTACT_TOWN",
a.CONTACT_ADDRESS,
p.IS_PROJECTS ,
p.DEPT_NAME,
...
...
@@ -1064,6 +1070,9 @@
LEFT JOIN sys_area a4 on a4.id=a.FILE_PROVINCE
LEFT JOIN sys_area a5 on a5.id=a.FILE_CITY
LEFT JOIN sys_area a6 on a6.id=a.FILE_TOWN
LEFT JOIN sys_area a7 on a7.id=a.CONTACT_PROVINCE
LEFT JOIN sys_area a8 on a8.id=a.CONTACT_CITY
LEFT JOIN sys_area a9 on a9.id=a.CONTACT_TOWN
LEFT JOIN view_project p on a.EMP_IDCARD=p.EMP_IDCARD
<where>
a.DELETE_FLAG = '0'
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
65dee890
...
...
@@ -118,6 +118,9 @@
<result
property=
"contractStatus"
column=
"CONTRACT_STATUS"
/>
<result
property=
"empLabel"
column=
"EMP_LABEL"
/>
<result
property=
"contractParty"
column=
"CONTRACT_PARTY"
/>
<result
property=
"contactProvince"
column=
"CONTACT_PROVINCE"
/>
<result
property=
"contactCity"
column=
"CONTACT_CITY"
/>
<result
property=
"contactTown"
column=
"CONTACT_TOWN"
/>
<result
property=
"contactAddress"
column=
"contact_address"
/>
</resultMap>
...
...
@@ -850,7 +853,11 @@
<!--tEmployeeInfo导出查询改造 fxj 2022-11-03-->
<select
id=
"noPageDiy"
resultMap=
"tEmployeeProjectExportMap"
>
SELECT
<include
refid=
"Base_Export_List"
/>
,b.contact_address
<include
refid=
"Base_Export_List"
/>
,
a10.AREA_NAME as "CONTACT_PROVINCE",
a11.AREA_NAME as "CONTACT_CITY",
a12.AREA_NAME as "CONTACT_TOWN",
b.contact_address
FROM t_employee_project a
left join t_employee_info b on a.EMP_ID = b.id
LEFT JOIN (
...
...
@@ -871,6 +878,9 @@
LEFT JOIN sys_area a7 on a7.id=a.SOCIAL_PROVINCE
LEFT JOIN sys_area a8 on a8.id=a.SOCIAL_CITY
LEFT JOIN sys_area a9 on a9.id=a.SOCIAL_TOWN
LEFT JOIN sys_area a10 on a10.id=b.CONTACT_PROVINCE
LEFT JOIN sys_area a11 on a11.id=b.CONTACT_CITY
LEFT JOIN sys_area a12 on a12.id=b.CONTACT_TOWN
<where>
a.DELETE_FLAG = '0'
<include
refid=
"exportTEmployeeProject_where"
/>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
View file @
65dee890
...
...
@@ -299,8 +299,11 @@
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,emp_married.label field13,nation.label field14
,politicalStatus.label field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
,concat(ifnull(pi.AREA_NAME,''),ifnull(ci.AREA_NAME,''),ifnull(ti.AREA_NAME,'')) field18 ,registype.label field19
,concat(ifnull(pf.AREA_NAME,''),ifnull(cf.AREA_NAME,''),ifnull(tf.AREA_NAME,'')) field20 ,if(e.status=0,'草稿','已审核') field21
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24
,concat(ifnull(pf.AREA_NAME,''),ifnull(cf.AREA_NAME,''),ifnull(tf.AREA_NAME,'')) field20 ,if(e.status=0,'草稿','已审核') field21,
cp.AREA_NAME as "field66",
cc.AREA_NAME as "field67",
ct.AREA_NAME as "field68"
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24
,concat(p.BUSINESS_PRIMARY_TYPE,'-',ifnull(p.BUSINESS_SECOND_TYPE,''),'-',ifnull(p.BUSINESS_THIRD_TYPE,'')) field25
,contractType.label field26 ,workingHours.label field27,p.POST field28,p.ENJOIN_DATE field29
,p.TRY_PERIOD field30,p.EMP_LABEL field31
...
...
@@ -329,6 +332,11 @@
left join sys_area pf on pf.id=e.FILE_PROVINCE
left join sys_area cf on cf.id=e.FILE_CITY
left join sys_area tf on tf.id=e.FILE_TOWN
left join sys_area cp on cp.id=e.CONTACT_PROVINCE
left join sys_area cc on cc.id=e.CONTACT_CITY
left join sys_area ct on ct.id=e.CONTACT_TOWN
left join t_pre_employee_project p on a.id=p.PRE_MAIN_ID
left join view_sys_dict_item contractType on contractType.value=p.CONTRACT_TYPE and contractType.type='personnel_type'
left join view_sys_dict_item workingHours on workingHours.value=p.WORKING_HOURS and workingHours.type='working_hours'
...
...
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