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
7ae7855e
Commit
7ae7855e
authored
Jul 01, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_校验
parent
830df433
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
16 deletions
+36
-16
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+32
-1
TCheckIdCardServiceImpl.java
...d/plus/v1/check/service/impl/TCheckIdCardServiceImpl.java
+2
-0
TCheckMobileServiceImpl.java
...d/plus/v1/check/service/impl/TCheckMobileServiceImpl.java
+2
-15
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
7ae7855e
...
@@ -315,12 +315,15 @@
...
@@ -315,12 +315,15 @@
,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
,educationEmp.label field40 ,ee.ENTRY_DATE field41,ee.GRADUTION_DATE field42
,educationEmp.label field40 ,ee.ENTRY_DATE field41,ee.GRADUTION_DATE field42
,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
,ef.FAMILY_NAME field48,ef.RELATIONSHIP_SELF field49,ef.CONTRACT_TEL field50
,if(e.HAVE_QUALIFICATION is null,'',if(e.HAVE_QUALIFICATION=0,'是','否')) field51,ep.DECLARE_YEAR field52,qualification_type.label field53
,if(ed.INJURY_IDENTIFICATION=0,'是','否') field54,if(ed.OCCUPATIONAL_DISEASE_FLAG=0,'是','否') field55 ,ed.OCCUPATIONAL_DISEASE field56
,if(ed.INJURY_IDENTIFICATION=0,'是','否') field54,if(ed.OCCUPATIONAL_DISEASE_FLAG=0,'是','否') field55 ,ed.OCCUPATIONAL_DISEASE field56
,if(ed.INFECTIOUS_DISEASE_FLAG=0,'是','否') field57 ,ed.INFECTIOUS_NAME field58 ,if(ed.DISABILITY_FLAG=0,'是','否') field59
,if(ed.INFECTIOUS_DISEASE_FLAG=0,'是','否') field57 ,ed.INFECTIOUS_NAME field58 ,if(ed.DISABILITY_FLAG=0,'是','否') field59
,ed.DISABILITY_NAME field60,ed.DISABILITY_LEVEL field61,if(ed.OTHER_FLAG=0,'是','否') field62,eb.REMARK field63
,ed.DISABILITY_NAME field60,ed.DISABILITY_LEVEL field61,if(ed.OTHER_FLAG=0,'是','否') field62,eb.REMARK field63
FROM t_complete_monitor a
FROM t_complete_monitor a
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join t_employee_project p on a.DEPT_NO=p.DEPT_NO
left join (
left join (
select
select
SUBSTRING_INDEX(GROUP_CONCAT(c.contract_name ORDER BY c.audit_time_last desc),',',1) contract_name
SUBSTRING_INDEX(GROUP_CONCAT(c.contract_name ORDER BY c.audit_time_last desc),',',1) contract_name
...
@@ -351,6 +354,34 @@
...
@@ -351,6 +354,34 @@
left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
left join view_sys_dict_item education on education.value=ee.EDUCATION_NAME and education.type='education'
left join t_emp_disability_info ed on e.id=ed.EMP_ID and ed.DELETE_FLAG = '0'
left join t_emp_disability_info ed on e.id=ed.EMP_ID and ed.DELETE_FLAG = '0'
left join t_emp_bad_record eb on e.id=eb.EMP_ID
left join t_emp_bad_record eb on e.id=eb.EMP_ID
left join (
select
SUBSTRING_INDEX(GROUP_CONCAT(ee.EMP_ID ORDER BY ee.create_time desc),',',1) EMP_ID
,SUBSTRING_INDEX(GROUP_CONCAT(ee.WORK_UNIT ORDER BY ee.create_time desc),',',1) WORK_UNIT
,SUBSTRING_INDEX(GROUP_CONCAT(ee.WORK_JOB ORDER BY ee.create_time desc),',',1) WORK_JOB
,SUBSTRING_INDEX(GROUP_CONCAT(ee.START_DATE ORDER BY ee.create_time desc),',',1) START_DATE
,SUBSTRING_INDEX(GROUP_CONCAT(ee.END_DATE ORDER BY ee.create_time desc),',',1) END_DATE
from t_emp_work_recording ee
GROUP BY ee.EMP_ID
) ew on e.id=ew.EMP_ID
left join (
select
SUBSTRING_INDEX(GROUP_CONCAT(ee.EMP_ID ORDER BY ee.create_time desc),',',1) EMP_ID
,SUBSTRING_INDEX(GROUP_CONCAT(ee.FAMILY_NAME ORDER BY ee.create_time desc),',',1) FAMILY_NAME
,SUBSTRING_INDEX(GROUP_CONCAT(ee.RELATIONSHIP_SELF ORDER BY ee.create_time desc),',',1) RELATIONSHIP_SELF
,SUBSTRING_INDEX(GROUP_CONCAT(ee.CONTRACT_TEL ORDER BY ee.create_time desc),',',1) CONTRACT_TEL
from t_emp_family ee
GROUP BY ee.EMP_ID
) ef on e.id=ef.EMP_ID
left join (
select
SUBSTRING_INDEX(GROUP_CONCAT(ee.EMP_ID ORDER BY ee.create_time desc),',',1) EMP_ID
,SUBSTRING_INDEX(GROUP_CONCAT(ee.DECLARE_YEAR ORDER BY ee.create_time desc),',',1) DECLARE_YEAR
,SUBSTRING_INDEX(GROUP_CONCAT(ee.QUALIFICATION_TYPE ORDER BY ee.create_time desc),',',1) QUALIFICATION_TYPE
from t_emp_professional_qualification ee
GROUP BY ee.EMP_ID
) ep on e.id=ep.EMP_ID
left join view_sys_dict_item qualification_type on qualification_type.value=ep.QUALIFICATION_TYPE and qualification_type.type='qualification_type'
<where>
<where>
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
p.DELETE_FLAG = '0' and p.PROJECT_STATUS = 0
<include
refid=
"tCompleteMonitor_where"
/>
<include
refid=
"tCompleteMonitor_where"
/>
...
...
yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckIdCardServiceImpl.java
View file @
7ae7855e
...
@@ -331,6 +331,8 @@ public class TCheckIdCardServiceImpl extends ServiceImpl<TCheckIdCardMapper, TCh
...
@@ -331,6 +331,8 @@ public class TCheckIdCardServiceImpl extends ServiceImpl<TCheckIdCardMapper, TCh
TPreEmpCheckNum
nowDayNum
=
tPreEmpCheckNumService
.
getTPreEmpCheckNum
(
deptId
,
nowDay
);
TPreEmpCheckNum
nowDayNum
=
tPreEmpCheckNumService
.
getTPreEmpCheckNum
(
deptId
,
nowDay
);
if
(
nowDayNum
==
null
)
{
if
(
nowDayNum
==
null
)
{
nowDayNum
=
new
TPreEmpCheckNum
();
nowDayNum
=
new
TPreEmpCheckNum
();
nowDayNum
.
setCreateDay
(
nowDay
);
nowDayNum
.
setDeptId
(
deptId
);
nowDayNum
.
setCanApiNum
(
1000
);
nowDayNum
.
setCanApiNum
(
1000
);
nowDayNum
.
setApiNum
(
1
);
nowDayNum
.
setApiNum
(
1
);
tPreEmpCheckNumService
.
save
(
nowDayNum
);
tPreEmpCheckNumService
.
save
(
nowDayNum
);
...
...
yifu-check/yifu-check-biz/src/main/java/com/yifu/cloud/plus/v1/check/service/impl/TCheckMobileServiceImpl.java
View file @
7ae7855e
...
@@ -214,6 +214,8 @@ public class TCheckMobileServiceImpl extends ServiceImpl<TCheckMobileMapper, TCh
...
@@ -214,6 +214,8 @@ public class TCheckMobileServiceImpl extends ServiceImpl<TCheckMobileMapper, TCh
TPreEmpCheckNum
nowDayNum
=
tPreEmpCheckNumService
.
getTPreEmpCheckNum
(
deptId
,
nowDay
);
TPreEmpCheckNum
nowDayNum
=
tPreEmpCheckNumService
.
getTPreEmpCheckNum
(
deptId
,
nowDay
);
if
(
nowDayNum
==
null
)
{
if
(
nowDayNum
==
null
)
{
nowDayNum
=
new
TPreEmpCheckNum
();
nowDayNum
=
new
TPreEmpCheckNum
();
nowDayNum
.
setCreateDay
(
nowDay
);
nowDayNum
.
setDeptId
(
deptId
);
nowDayNum
.
setCanApiNum
(
1000
);
nowDayNum
.
setCanApiNum
(
1000
);
nowDayNum
.
setApiNum
(
1
);
nowDayNum
.
setApiNum
(
1
);
tPreEmpCheckNumService
.
save
(
nowDayNum
);
tPreEmpCheckNumService
.
save
(
nowDayNum
);
...
@@ -226,21 +228,6 @@ public class TCheckMobileServiceImpl extends ServiceImpl<TCheckMobileMapper, TCh
...
@@ -226,21 +228,6 @@ public class TCheckMobileServiceImpl extends ServiceImpl<TCheckMobileMapper, TCh
}
}
}
}
}
}
CheckBatchVo
vo
=
new
CheckBatchVo
();
Map
<
String
,
Boolean
>
noMap
=
new
HashMap
<>();
List
<
String
>
noList
=
new
ArrayList
<>();
noList
.
add
(
phone
);
List
<
TCheckMobile
>
checkMobileList
=
baseMapper
.
getListByNoList
(
noList
);
if
(
checkMobileList
!=
null
&&
!
checkMobileList
.
isEmpty
())
{
for
(
TCheckMobile
no
:
checkMobileList
)
{
noMap
.
put
(
no
.
getMobile
(),
CommonConstants
.
ONE_STRING
.
equals
(
no
.
getStatus
())
||
CommonConstants
.
FOUR_STRING
.
equals
(
no
.
getStatus
())
||
CommonConstants
.
FIVE_STRING
.
equals
(
no
.
getStatus
()));
}
}
List
<
String
>
tempList
=
new
ArrayList
<>();
// 因手机号码最多50个所以这里 要特殊处理下
tempList
.
add
(
phone
);
synchronized
(
this
)
{
synchronized
(
this
)
{
R
<
Map
<
String
,
TCheckMobile
>>
mobileMapR
=
ChecksUtil
.
checkMobile
(
phone
,
canCheck
);
R
<
Map
<
String
,
TCheckMobile
>>
mobileMapR
=
ChecksUtil
.
checkMobile
(
phone
,
canCheck
);
if
(
Common
.
isNotNull
(
mobileMapR
)
&&
Common
.
isNotNull
(
mobileMapR
.
getData
()))
{
if
(
Common
.
isNotNull
(
mobileMapR
)
&&
Common
.
isNotNull
(
mobileMapR
.
getData
()))
{
...
...
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