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
cbc20c9f
Commit
cbc20c9f
authored
Apr 23, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22
parents
13d0a983
7ac443b6
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
21 additions
and
3 deletions
+21
-3
EmployeeExportVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
+4
-0
PreUploadEmpImportTwoVo.java
...oud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
+2
-0
TMainExportAllVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
+2
-0
TPreMainExportAllVO.java
...u/cloud/plus/v1/yifu/archives/vo/TPreMainExportAllVO.java
+2
-0
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+1
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+5
-1
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+1
-0
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+2
-0
TPreEmpMainMapper.xml
...hives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
View file @
cbc20c9f
...
@@ -100,6 +100,10 @@ public class EmployeeExportVO extends BaseEntity {
...
@@ -100,6 +100,10 @@ public class EmployeeExportVO extends BaseEntity {
@ExcelProperty
(
value
=
"邮箱"
)
@ExcelProperty
(
value
=
"邮箱"
)
private
String
empEmail
;
private
String
empEmail
;
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"微信号"
)
private
String
weChatId
;
@ExcelAttribute
(
name
=
"户籍所在省"
,
isArea
=
true
)
@ExcelAttribute
(
name
=
"户籍所在省"
,
isArea
=
true
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"户籍所在省"
)
@ExcelProperty
(
value
=
"户籍所在省"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/PreUploadEmpImportTwoVo.java
View file @
cbc20c9f
...
@@ -57,6 +57,8 @@ public class PreUploadEmpImportTwoVo implements Serializable {
...
@@ -57,6 +57,8 @@ public class PreUploadEmpImportTwoVo implements Serializable {
private
String
empPhone
;
private
String
empPhone
;
@ExcelAttribute
(
name
=
"邮箱"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"邮箱"
,
maxLength
=
50
)
private
String
empEmail
;
private
String
empEmail
;
@ExcelAttribute
(
name
=
"微信号"
,
maxLength
=
50
)
private
String
weChatId
;
// 区域ID
// 区域ID
@ExcelAttribute
(
name
=
"户籍所在地-省"
,
isArea
=
true
)
@ExcelAttribute
(
name
=
"户籍所在地-省"
,
isArea
=
true
)
private
String
idProvince
;
private
String
idProvince
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TMainExportAllVO.java
View file @
cbc20c9f
...
@@ -75,6 +75,8 @@ public class TMainExportAllVO {
...
@@ -75,6 +75,8 @@ public class TMainExportAllVO {
private
String
field16
;
private
String
field16
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"邮箱"
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"邮箱"
)
private
String
field17
;
private
String
field17
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"微信号"
)
private
String
field79
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-省"
,
isArea
=
true
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-省"
,
isArea
=
true
)
private
String
field18
;
private
String
field18
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-市"
,
isArea
=
true
,
parentField
=
"field18"
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-市"
,
isArea
=
true
,
parentField
=
"field18"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TPreMainExportAllVO.java
View file @
cbc20c9f
...
@@ -81,6 +81,8 @@ public class TPreMainExportAllVO {
...
@@ -81,6 +81,8 @@ public class TPreMainExportAllVO {
private
String
field16
;
private
String
field16
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"邮箱"
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"邮箱"
)
private
String
field17
;
private
String
field17
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"微信号"
)
private
String
field79
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-省"
,
isArea
=
true
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-省"
,
isArea
=
true
)
private
String
field18
;
private
String
field18
;
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-市"
,
isArea
=
true
,
parentField
=
"field18"
)
@ExcelAttribute
(
needExport
=
true
,
name
=
"户籍所在地-市"
,
isArea
=
true
,
parentField
=
"field18"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
cbc20c9f
...
@@ -553,6 +553,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -553,6 +553,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
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
,
"微信号"
}));
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
,
"户籍所在地-区/县"
}));
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
cbc20c9f
...
@@ -3719,7 +3719,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -3719,7 +3719,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
return
R
.
failed
(
voR
==
null
?
"人员批量更新识别表格异常!"
:
voR
.
getMsg
());
return
R
.
failed
(
voR
==
null
?
"人员批量更新识别表格异常!"
:
voR
.
getMsg
());
}
}
String
[]
modelTitle
=
{
"员工姓名"
,
"身份证号"
,
"员工类型"
,
"身份证开始日期"
,
"身份证截止日期"
,
"婚姻状况"
,
"民族"
String
[]
modelTitle
=
{
"员工姓名"
,
"身份证号"
,
"员工类型"
,
"身份证开始日期"
,
"身份证截止日期"
,
"婚姻状况"
,
"民族"
,
"政治面貌"
,
"手机号码"
,
"邮箱"
,
"户籍所在地-省"
,
"户籍所在地-市"
,
"户籍所在地-区/县"
,
"户口性质"
,
"档案所在地-省"
,
"政治面貌"
,
"手机号码"
,
"邮箱"
,
"
微信号"
,
"
户籍所在地-省"
,
"户籍所在地-市"
,
"户籍所在地-区/县"
,
"户口性质"
,
"档案所在地-省"
,
"档案所在地-市"
,
"档案所在地-区/县"
,
"通信地址-省"
,
"通信地址-市"
,
"通信地址-区/县"
,
"通信地址-详细地址"
,
"备注"
,
"档案所在地-市"
,
"档案所在地-区/县"
,
"通信地址-省"
,
"通信地址-市"
,
"通信地址-区/县"
,
"通信地址-详细地址"
,
"备注"
,
"是否大专及以上"
,
"最高学历"
,
"学校"
,
"专业"
,
"入学时间"
,
"毕业时间"
,
"是否大专及以上"
,
"最高学历"
,
"学校"
,
"专业"
,
"入学时间"
,
"毕业时间"
,
"是否为首份工作"
,
"工作单位"
,
"工作岗位"
,
"开始工作日期"
,
"结束工作日期"
,
"是否为首份工作"
,
"工作单位"
,
"工作岗位"
,
"开始工作日期"
,
"结束工作日期"
...
@@ -4358,6 +4358,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -4358,6 +4358,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
excel
.
getEmpEmail
()))
{
if
(
Common
.
isNotNull
(
excel
.
getEmpEmail
()))
{
saveEmp
.
setEmpEmail
(
excel
.
getEmpEmail
());
saveEmp
.
setEmpEmail
(
excel
.
getEmpEmail
());
}
}
// 微信号
if
(
Common
.
isNotNull
(
excel
.
getWeChatId
()))
{
saveEmp
.
setWeChatId
(
excel
.
getWeChatId
());
}
if
(
Common
.
isNotNull
(
excel
.
getSchool
()))
{
if
(
Common
.
isNotNull
(
excel
.
getSchool
()))
{
saveEmp
.
setSchool
(
excel
.
getSchool
());
saveEmp
.
setSchool
(
excel
.
getSchool
());
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
cbc20c9f
...
@@ -3188,6 +3188,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -3188,6 +3188,7 @@ 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
,
"微信号"
}));
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
,
"户籍所在地-区/县"
}));
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
cbc20c9f
...
@@ -483,7 +483,7 @@
...
@@ -483,7 +483,7 @@
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
,e.WE_CHAT_ID field79
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.ID_PROVINCE field18,e.EMP_REGIS_TYPE field19
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.ID_PROVINCE field18,e.EMP_REGIS_TYPE field19
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24,p.DEPT_NO field64
,e.CONTACT_ADDRESS field22,p.UNIT_NAME field23,p.DEPT_NAME field24,p.DEPT_NO field64
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
cbc20c9f
...
@@ -106,6 +106,7 @@
...
@@ -106,6 +106,7 @@
<result
property=
"politicalStatus"
column=
"POLITICAL_STATUS"
/>
<result
property=
"politicalStatus"
column=
"POLITICAL_STATUS"
/>
<result
property=
"empPhone"
column=
"EMP_PHONE"
/>
<result
property=
"empPhone"
column=
"EMP_PHONE"
/>
<result
property=
"empEmail"
column=
"EMP_EMAIL"
/>
<result
property=
"empEmail"
column=
"EMP_EMAIL"
/>
<result
property=
"weChatId"
column=
"WE_CHAT_ID"
/>
<result
property=
"idProvince"
column=
"ID_PROVINCE"
/>
<result
property=
"idProvince"
column=
"ID_PROVINCE"
/>
<result
property=
"idCity"
column=
"ID_CITY"
/>
<result
property=
"idCity"
column=
"ID_CITY"
/>
<result
property=
"idTown"
column=
"ID_TOWN"
/>
<result
property=
"idTown"
column=
"ID_TOWN"
/>
...
@@ -1054,6 +1055,7 @@
...
@@ -1054,6 +1055,7 @@
a.POLITICAL_STATUS,
a.POLITICAL_STATUS,
a.EMP_PHONE,
a.EMP_PHONE,
a.EMP_EMAIL,
a.EMP_EMAIL,
a.WE_CHAT_ID,
a1.AREA_NAME as "ID_PROVINCE",
a1.AREA_NAME as "ID_PROVINCE",
a2.AREA_NAME as "ID_CITY",
a2.AREA_NAME as "ID_CITY",
a3.AREA_NAME as "ID_TOWN",
a3.AREA_NAME as "ID_TOWN",
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
View file @
cbc20c9f
...
@@ -277,7 +277,7 @@
...
@@ -277,7 +277,7 @@
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.EMP_SEX='2','女',if(e.EMP_SEX='1','男','-')) field7
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END is null,'-',if(e.VALIDITY_END > '2999-12-30','长期','固定')) field8 ,e.VALIDITY_START field9
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14
,if(e.VALIDITY_END > '2999-12-30','长期',e.VALIDITY_END) field10,e.EMP_BIRTHDAY field11,e.EMP_AGE field12 ,e.EMP_MARRI_STATUS field13,e.EMP_NATIONAL field14
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
,e.POLITICAL_STATUS field15,e.EMP_PHONE field16,e.EMP_EMAIL field17
,e.WE_CHAT_ID field79
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.EMP_REGIS_TYPE field19
,e.ID_PROVINCE field18,e.ID_CITY field69,e.ID_TOWN field70,e.EMP_REGIS_TYPE field19
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21,
,e.FILE_PROVINCE field20,e.FILE_CITY field71,e.FILE_TOWN field72,if(e.status=0,'草稿','已审核') field21,
e.CONTACT_PROVINCE as "field66", e.CONTACT_CITY as "field67", e.CONTACT_TOWN as "field68"
e.CONTACT_PROVINCE as "field66", e.CONTACT_CITY as "field67", e.CONTACT_TOWN as "field68"
...
...
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