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
18b6c01d
Commit
18b6c01d
authored
Apr 17, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记商险待办提交
parent
f067ea0d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
4 deletions
+14
-4
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+3
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+6
-2
TEmployeeProjectBelongDeptServiceImpl.java
...s/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
+1
-1
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+4
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
18b6c01d
...
...
@@ -675,6 +675,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
public
R
<
EmployeeInfoMsgVo
>
getEmployeeInfo
(
String
id
)
{
//获取人员档案id
EmployeeInfoMsgVo
msgInfoVo
=
baseMapper
.
getEmployeeArchivesInfo
(
id
);
if
(
Common
.
isEmpty
(
msgInfoVo
))
{
return
R
.
failed
(
CommonConstants
.
PARAM_IS_NOT_ERROR
);
}
//获取预入职信息,如果有的话提示
TPreEmpMain
empMain
=
empMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
().
lambda
()
.
eq
(
TPreEmpMain:
:
getEmpIdcard
,
msgInfoVo
.
getCard
())
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
18b6c01d
...
...
@@ -767,7 +767,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//根据项目编码和身份证号查询预入职列表
TPreEmpMain
empMain
=
preEmpMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
()
.
lambda
().
eq
(
TPreEmpMain:
:
getEmpIdcard
,
contractInfo
.
getEmpIdcard
())
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contractInfo
.
getDeptNo
()));
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contractInfo
.
getDeptNo
())
.
ne
(
TPreEmpMain:
:
getStatus
,
CommonConstants
.
FIVE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
empMain
).
isPresent
())
{
//查询预入职项目档案表
TPreEmployeeProject
preEmployeeProject
=
preEmployeeProjectMapper
.
selectOne
(
Wrappers
.<
TPreEmployeeProject
>
query
()
...
...
@@ -1675,7 +1677,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//根据项目编码和身份证号查询预入职列表
TPreEmpMain
empMain
=
preEmpMainMapper
.
selectOne
(
Wrappers
.<
TPreEmpMain
>
query
()
.
lambda
().
eq
(
TPreEmpMain:
:
getEmpIdcard
,
contract
.
getEmpIdcard
())
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contract
.
getDeptNo
()));
.
eq
(
TPreEmpMain:
:
getDeptNo
,
contract
.
getDeptNo
())
.
ne
(
TPreEmpMain:
:
getStatus
,
CommonConstants
.
FIVE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Optional
.
ofNullable
(
empMain
).
isPresent
())
{
//查询预入职项目档案表
TPreEmployeeProject
preEmployeeProject
=
preEmployeeProjectMapper
.
selectOne
(
Wrappers
.<
TPreEmployeeProject
>
query
()
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
View file @
18b6c01d
...
...
@@ -203,7 +203,7 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
dept
.
setId
(
vo
.
getProjectId
());
dept
.
setEmpDeptid
(
vo
.
getDepartId
().
toString
());
dept
.
setEmpDeptname
(
vo
.
getDepartName
());
this
.
save
(
dept
);
this
.
save
OrUpdate
(
dept
);
}
else
{
this
.
removeById
(
vo
.
getProjectId
());
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
18b6c01d
...
...
@@ -117,6 +117,9 @@
<sql
id=
"employeeRegistrationPre_where"
>
<if
test=
"employeeRegistrationPre != null"
>
<if
test=
"employeeRegistrationPre.id != null and employeeRegistrationPre.id.trim() != ''"
>
AND a.id = #{employeeRegistrationPre.id}
</if>
<if
test=
"employeeRegistrationPre.employeeName != null and employeeRegistrationPre.employeeName.trim() != ''"
>
AND a.EMP_NAME like CONCAT('%',#{employeeRegistrationPre.employeeName},'%')
</if>
...
...
@@ -183,7 +186,7 @@
inner join t_employee_info b on a.EMP_ID = b.id
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
<where>
a.delete_flag = '0' and a.IS_COMPLETE = '1'
a.delete_flag = '0' and a.IS_COMPLETE = '1'
and a.project_status = 0
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
order by a.CREATE_TIME desc
...
...
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