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
d96623bc
Commit
d96623bc
authored
Mar 27, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记提交
parent
75f342f7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
0 deletions
+17
-0
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+4
-0
EmployeeRegistrationSearchVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationSearchVo.java
+4
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+3
-0
EmployeeRegistrationMapper.xml
.../src/main/resources/mapper/EmployeeRegistrationMapper.xml
+6
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
d96623bc
...
@@ -7,6 +7,7 @@ import lombok.Data;
...
@@ -7,6 +7,7 @@ import lombok.Data;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
/**
/**
* 确认接受vo
* 确认接受vo
...
@@ -115,4 +116,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
...
@@ -115,4 +116,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
@Schema
(
description
=
"更新人"
)
@Schema
(
description
=
"更新人"
)
private
String
updateBy
;
private
String
updateBy
;
@Schema
(
description
=
"身份证合集"
)
private
List
<
String
>
idcardList
;
}
}
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationSearchVo.java
View file @
d96623bc
...
@@ -86,4 +86,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
...
@@ -86,4 +86,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
@Schema
(
description
=
"列表类型 1 待办 2监控"
)
private
String
type
;
private
String
type
;
@Schema
(
description
=
"身份证合集"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
idcardList
;
}
}
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
d96623bc
...
@@ -570,6 +570,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -570,6 +570,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
searchVo
.
setStatusList
(
CommonConstants
.
processPreStatus
);
searchVo
.
setStatusList
(
CommonConstants
.
processPreStatus
);
searchVo
.
setTypeList
(
CommonConstants
.
processPreStatus
);
searchVo
.
setTypeList
(
CommonConstants
.
processPreStatus
);
searchVo
.
setDeptNo
(
preVo
.
getDeptNo
());
searchVo
.
setDeptNo
(
preVo
.
getDeptNo
());
if
(
Common
.
isNotNull
(
preVo
.
getIdcardList
()))
{
searchVo
.
setIdcardList
(
preVo
.
getIdcardList
());
}
List
<
EmployeeRegistration
>
registrationList
=
baseMapper
.
getEmployeeRegistrationList
(
searchVo
);
List
<
EmployeeRegistration
>
registrationList
=
baseMapper
.
getEmployeeRegistrationList
(
searchVo
);
YifuUser
user
=
SecurityUtils
.
getUser
();
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
Common
.
isEmpty
(
registrationList
))
{
if
(
Common
.
isEmpty
(
registrationList
))
{
...
...
yifu-csp/yifu-csp-biz/src/main/resources/mapper/EmployeeRegistrationMapper.xml
View file @
d96623bc
...
@@ -132,6 +132,12 @@
...
@@ -132,6 +132,12 @@
<if
test=
"employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''"
>
<if
test=
"employeeRegistration.empIdcard != null and employeeRegistration.empIdcard.trim() != ''"
>
AND a.emp_idcard like CONCAT('%',#{employeeRegistration.empIdcard},'%')
AND a.emp_idcard like CONCAT('%',#{employeeRegistration.empIdcard},'%')
</if>
</if>
<if
test=
"employeeRegistration.idcardList != null and employeeRegistration.idcardList.size() > 0 "
>
AND a.emp_idcard in
<foreach
item=
"item"
index=
"index"
collection=
"employeeRegistration.idcardList"
open=
"("
separator=
","
close=
")"
>
'${item}'
</foreach>
</if>
<if
test=
"employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"
>
<if
test=
"employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"
>
AND a.emp_phone like CONCAT('%',#{employeeRegistration.empPhone},'%')
AND a.emp_phone like CONCAT('%',#{employeeRegistration.empPhone},'%')
</if>
</if>
...
...
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