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
5a836f7a
Commit
5a836f7a
authored
Jul 04, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_先删后加
parent
2fddaa3c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
283 deletions
+31
-283
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+3
-1
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+19
-5
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+9
-277
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
5a836f7a
...
...
@@ -182,13 +182,15 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
**/
TEmployeeProject
getByEmpIdAndDeptId
(
String
empId
,
String
deptId
);
TEmployeeProject
getByEmpIdCardAndDeptId
(
String
empIdCard
,
String
deptId
);
/**
* @Description: 获取已减项或已删除的项目档案信息
* @Author: hgw
* @Date: 2024/6/19 15:00
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
**/
TEmployeeProject
getByEmpId
AndDeptIdAndDelete
(
String
empI
d
,
String
deptId
);
TEmployeeProject
getByEmpId
CardAndDeptIdAndDelete
(
String
empIdCar
d
,
String
deptId
);
R
<
Map
<
String
,
String
>>
getProjectByIdCard
(
String
empIdCard
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
5a836f7a
...
...
@@ -1340,17 +1340,31 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
@Override
public
TEmployeeProject
getByEmpId
AndDeptIdAndDelete
(
String
empI
d
,
String
deptId
)
{
public
TEmployeeProject
getByEmpId
CardAndDeptId
(
String
empIdCar
d
,
String
deptId
)
{
TEmployeeProject
employeeProject
=
null
;
if
(
Common
.
isNotNull
(
empId
)
&&
Common
.
isNotNull
(
deptId
))
{
if
(
Common
.
isEmpty
(
empIdCard
)
||
Common
.
isEmpty
(
deptId
))
{
return
employeeProject
;
}
employeeProject
=
this
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpIdcard
,
empIdCard
)
.
eq
(
TEmployeeProject:
:
getDeptId
,
deptId
)
.
eq
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
employeeProject
;
}
@Override
public
TEmployeeProject
getByEmpIdCardAndDeptIdAndDelete
(
String
empIdCard
,
String
deptId
)
{
TEmployeeProject
employeeProject
=
null
;
if
(
Common
.
isNotNull
(
empIdCard
)
&&
Common
.
isNotNull
(
deptId
))
{
employeeProject
=
this
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpId
,
empI
d
)
.
eq
(
TEmployeeProject:
:
getEmpId
card
,
empIdCar
d
)
.
eq
(
TEmployeeProject:
:
getDeptId
,
deptId
)
.
ne
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ZERO
_INT
)
.
ne
(
TEmployeeProject:
:
getProjectStatus
,
CommonConstants
.
ONE
_INT
)
.
eq
(
TEmployeeProject:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
employeeProject
==
null
)
{
employeeProject
=
this
.
getOne
(
Wrappers
.<
TEmployeeProject
>
query
().
lambda
()
.
eq
(
TEmployeeProject:
:
getEmpId
,
empI
d
)
.
eq
(
TEmployeeProject:
:
getEmpId
card
,
empIdCar
d
)
.
eq
(
TEmployeeProject:
:
getDeptId
,
deptId
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
5a836f7a
This diff is collapsed.
Click to expand it.
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