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
33db7c9e
Commit
33db7c9e
authored
Jul 09, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
72a94d99
70bcb1cf
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
316 additions
and
540 deletions
+316
-540
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+2
-1
TCompleteMonitorController.java
.../yifu/archives/controller/TCompleteMonitorController.java
+2
-2
TPreEmpMainController.java
...us/v1/yifu/archives/controller/TPreEmpMainController.java
+2
-2
TCompleteMonitorService.java
...lus/v1/yifu/archives/service/TCompleteMonitorService.java
+1
-1
TPreEmpMainService.java
...oud/plus/v1/yifu/archives/service/TPreEmpMainService.java
+1
-1
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+150
-380
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+150
-145
TPreEmpMainMapper.xml
...hives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
+8
-8
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
33db7c9e
...
@@ -249,7 +249,8 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -249,7 +249,8 @@ public class TEmployeeContractInfo extends BaseEntity {
private
String
settleDomain
;
private
String
settleDomain
;
/**
/**
* 员工类型
* 员工类型_
* 其实是:合同类型。hgw 2024-7-9 11:45:59 验证
*/
*/
@ExcelAttribute
(
name
=
"员工类型"
,
errorInfo
=
"员工类型不能为空"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_TYPE
)
@ExcelAttribute
(
name
=
"员工类型"
,
errorInfo
=
"员工类型不能为空"
,
maxLength
=
32
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
PERSONNEL_TYPE
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCompleteMonitorController.java
View file @
33db7c9e
...
@@ -47,10 +47,10 @@ public class TCompleteMonitorController {
...
@@ -47,10 +47,10 @@ public class TCompleteMonitorController {
@Operation
(
description
=
"导出档案完整度监控管理-全量 权限:archves_tcompletemonitor_export_all"
)
@Operation
(
description
=
"导出档案完整度监控管理-全量 权限:archves_tcompletemonitor_export_all"
)
@PostMapping
(
"/exportAll"
)
@PostMapping
(
"/exportAll"
)
//@PreAuthorize("@pms.hasPermission('archves_tcompletemonitor_export_all')")
//@PreAuthorize("@pms.hasPermission('archves_tcompletemonitor_export_all')")
public
R
<
String
>
exportAll
(
HttpServletResponse
response
,
@RequestBody
TCompleteMonitorSearchVo
searchVo
)
{
public
void
exportAll
(
HttpServletResponse
response
,
@RequestBody
TCompleteMonitorSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
menuUtil
.
setAuthSql
(
user
,
searchVo
);
return
tCompleteMonitorService
.
exportAll
(
response
,
searchVo
);
tCompleteMonitorService
.
exportAll
(
response
,
searchVo
);
}
}
/**
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TPreEmpMainController.java
View file @
33db7c9e
...
@@ -242,10 +242,10 @@ public class TPreEmpMainController {
...
@@ -242,10 +242,10 @@ public class TPreEmpMainController {
@Operation
(
summary
=
"导出预入职-全量"
,
description
=
"导出预入职-全量 hasPermission('archives_tpreempmain-export-all')"
)
@Operation
(
summary
=
"导出预入职-全量"
,
description
=
"导出预入职-全量 hasPermission('archives_tpreempmain-export-all')"
)
@PostMapping
(
"/exportAll"
)
@PostMapping
(
"/exportAll"
)
//@PreAuthorize("@pms.hasPermission('archives_tpreempmain-export-all')")
//@PreAuthorize("@pms.hasPermission('archives_tpreempmain-export-all')")
public
R
<
String
>
exportAll
(
HttpServletResponse
response
,
@RequestBody
TPreEmpMainSearchVo
searchVo
)
{
public
void
exportAll
(
HttpServletResponse
response
,
@RequestBody
TPreEmpMainSearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
menuUtil
.
setAuthSql
(
user
,
searchVo
);
menuUtil
.
setAuthSql
(
user
,
searchVo
);
return
tPreEmpMainService
.
exportAll
(
response
,
searchVo
);
tPreEmpMainService
.
exportAll
(
response
,
searchVo
);
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TCompleteMonitorService.java
View file @
33db7c9e
...
@@ -61,6 +61,6 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
...
@@ -61,6 +61,6 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
IPage
<
TCompleteMonitorInfoVo
>
getMonitorEmpInfoListPage
(
Page
<
TCompleteMonitorInfoVo
>
page
,
String
deptNo
);
IPage
<
TCompleteMonitorInfoVo
>
getMonitorEmpInfoListPage
(
Page
<
TCompleteMonitorInfoVo
>
page
,
String
deptNo
);
// 导出全量
// 导出全量
R
<
String
>
exportAll
(
HttpServletResponse
response
,
TCompleteMonitorSearchVo
searchVo
);
void
exportAll
(
HttpServletResponse
response
,
TCompleteMonitorSearchVo
searchVo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TPreEmpMainService.java
View file @
33db7c9e
...
@@ -75,7 +75,7 @@ public interface TPreEmpMainService extends IService<TPreEmpMain> {
...
@@ -75,7 +75,7 @@ public interface TPreEmpMainService extends IService<TPreEmpMain> {
// 导出
// 导出
void
listExport
(
HttpServletResponse
response
,
TPreEmpMainSearchVo
searchVo
);
void
listExport
(
HttpServletResponse
response
,
TPreEmpMainSearchVo
searchVo
);
// 导出全量
// 导出全量
R
<
String
>
exportAll
(
HttpServletResponse
response
,
TPreEmpMainSearchVo
searchVo
);
void
exportAll
(
HttpServletResponse
response
,
TPreEmpMainSearchVo
searchVo
);
List
<
TPreEmpMain
>
noPageDiy
(
TPreEmpMainSearchVo
searchVo
);
List
<
TPreEmpMain
>
noPageDiy
(
TPreEmpMainSearchVo
searchVo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
33db7c9e
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
33db7c9e
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
View file @
33db7c9e
...
@@ -295,7 +295,7 @@
...
@@ -295,7 +295,7 @@
,concat(ifnull(pf.AREA_NAME,''),ifnull(cf.AREA_NAME,''),ifnull(tf.AREA_NAME,'')) field20 ,if(e.status=0,'草稿','已审核') field21
,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
,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
,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
,
eci.contract_name
field26 ,workingHours.label field27,p.POST field28,p.ENJOIN_DATE field29
,p.TRY_PERIOD field30,p.EMP_LABEL field31
,p.TRY_PERIOD field30,p.EMP_LABEL field31
,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35
,ec.EMP_NAME field32,ec.RELATION_TYPE field33,ec.ADDRESS field34,ec.TEL field35
,ee.SCHOOL field36,ee.MAJOR field37,education.label field38,if(e.IS_COLLEGE=0,'否','是') field39
,ee.SCHOOL field36,ee.MAJOR field37,education.label field38,if(e.IS_COLLEGE=0,'否','是') field39
...
@@ -323,7 +323,7 @@
...
@@ -323,7 +323,7 @@
left join sys_area cf on cf.id=e.FILE_CITY
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 tf on tf.id=e.FILE_TOWN
left join t_pre_employee_project p on a.id=p.PRE_MAIN_ID
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='
employee_contract
_type'
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'
left join view_sys_dict_item workingHours on workingHours.value=p.WORKING_HOURS and workingHours.type='working_hours'
left join t_pre_emp_contact_info ec on a.id=ec.PRE_MAIN_ID
left join t_pre_emp_contact_info ec on a.id=ec.PRE_MAIN_ID
left join t_pre_emp_education ee on a.id=ee.PRE_MAIN_ID
left join t_pre_emp_education ee on a.id=ee.PRE_MAIN_ID
...
@@ -384,7 +384,7 @@
...
@@ -384,7 +384,7 @@
count(1)
count(1)
FROM t_pre_emp_main a
FROM t_pre_emp_main a
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_emp_work_recording ew on a.id=ew.
EMP
_ID
left join t_pre_emp_work_recording ew on a.id=ew.
PRE_MAIN
_ID
<where>
<where>
a.STATUS != '5' and ew.id is not null and EXISTS (
a.STATUS != '5' and ew.id is not null and EXISTS (
select 1 from (select a.emp_id from t_pre_emp_work_recording a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ew.emp_id
select 1 from (select a.emp_id from t_pre_emp_work_recording a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ew.emp_id
...
@@ -400,7 +400,7 @@
...
@@ -400,7 +400,7 @@
,if(e.FIRST_WORK_FLAG is null,'',if(e.FIRST_WORK_FLAG=0,'是','否')) field43,ew.WORK_UNIT field44,ew.WORK_JOB field45,ew.START_DATE field46,ew.END_DATE field47
,if(e.FIRST_WORK_FLAG is null,'',if(e.FIRST_WORK_FLAG=0,'是','否')) field43,ew.WORK_UNIT field44,ew.WORK_JOB field45,ew.START_DATE field46,ew.END_DATE field47
FROM t_pre_emp_main a
FROM t_pre_emp_main a
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_emp_work_recording ew on a.id=ew.
EMP
_ID
left join t_pre_emp_work_recording ew on a.id=ew.
PRE_MAIN
_ID
<where>
<where>
a.STATUS != '5' and ew.id is not null and EXISTS (
a.STATUS != '5' and ew.id is not null and EXISTS (
select 1 from (select a.emp_id from t_pre_emp_work_recording a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ew.emp_id
select 1 from (select a.emp_id from t_pre_emp_work_recording a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ew.emp_id
...
@@ -421,7 +421,7 @@
...
@@ -421,7 +421,7 @@
count(1)
count(1)
FROM t_pre_emp_main a
FROM t_pre_emp_main a
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_emp_family ef on a.id=ef.
EMP
_ID
left join t_pre_emp_family ef on a.id=ef.
PRE_MAIN
_ID
<where>
<where>
a.STATUS != '5' and ef.id is not null and EXISTS (
a.STATUS != '5' and ef.id is not null and EXISTS (
select 1 from (select a.emp_id from t_pre_emp_family a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ef.emp_id
select 1 from (select a.emp_id from t_pre_emp_family a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ef.emp_id
...
@@ -436,7 +436,7 @@
...
@@ -436,7 +436,7 @@
,ef.FAMILY_NAME field48,family_relation.label field49,ef.CONTRACT_TEL field50
,ef.FAMILY_NAME field48,family_relation.label field49,ef.CONTRACT_TEL field50
FROM t_pre_emp_main a
FROM t_pre_emp_main a
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_emp_family ef on a.id=ef.
EMP
_ID
left join t_pre_emp_family ef on a.id=ef.
PRE_MAIN
_ID
left join view_sys_dict_item family_relation on family_relation.value=ef.RELATIONSHIP_SELF and family_relation.type='family_relation'
left join view_sys_dict_item family_relation on family_relation.value=ef.RELATIONSHIP_SELF and family_relation.type='family_relation'
<where>
<where>
a.STATUS != '5' and ef.id is not null and EXISTS (
a.STATUS != '5' and ef.id is not null and EXISTS (
...
@@ -458,7 +458,7 @@
...
@@ -458,7 +458,7 @@
count(1)
count(1)
FROM t_pre_emp_main a
FROM t_pre_emp_main a
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_emp_professional_qualification ep on a.id=ep.
EMP
_ID
left join t_pre_emp_professional_qualification ep on a.id=ep.
PRE_MAIN
_ID
<where>
<where>
a.STATUS != '5' and ep.id is not null and EXISTS (
a.STATUS != '5' and ep.id is not null and EXISTS (
select 1 from (select a.emp_id from t_pre_emp_professional_qualification a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ep.emp_id
select 1 from (select a.emp_id from t_pre_emp_professional_qualification a GROUP BY a.EMP_ID HAVING count(1)>1) ea where ea.emp_id=ep.emp_id
...
@@ -473,7 +473,7 @@
...
@@ -473,7 +473,7 @@
,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51,ep.DECLARE_YEAR field52,qualification_type.label field53
,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51,ep.DECLARE_YEAR field52,qualification_type.label field53
FROM t_pre_emp_main a
FROM t_pre_emp_main a
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_employee_info e on a.id=e.PRE_MAIN_ID
left join t_pre_emp_professional_qualification ep on a.id=ep.
EMP
_ID
left join t_pre_emp_professional_qualification ep on a.id=ep.
PRE_MAIN
_ID
left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
<where>
<where>
a.STATUS != '5' and ep.id is not null and EXISTS (
a.STATUS != '5' and ep.id is not null and EXISTS (
...
...
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