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
0fb39ba7
Commit
0fb39ba7
authored
Mar 04, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
bc884f69
812a2a95
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
TEmployeeProjectController.java
.../yifu/archives/controller/TEmployeeProjectController.java
+2
-2
TEmployeeProjectService.java
...lus/v1/yifu/archives/service/TEmployeeProjectService.java
+8
-0
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+11
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java
View file @
0fb39ba7
...
...
@@ -105,8 +105,8 @@ public class TEmployeeProjectController {
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/{id}"
)
public
R
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tEmployeeProjectService
.
getById
(
id
));
public
R
<
TEmployeeProject
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tEmployeeProjectService
.
get
Info
ById
(
id
));
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java
View file @
0fb39ba7
...
...
@@ -129,6 +129,14 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
**/
List
<
TEmployeeProject
>
getListByEmpId
(
String
empId
,
int
projectStatus
);
/**
* @Description: 获取详情
* @Author: hgw
* @Date: 2025/3/4 16:05
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
**/
TEmployeeProject
getInfoById
(
String
id
);
/**
* @param empId
* @param deptNo
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
0fb39ba7
...
...
@@ -1387,6 +1387,17 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return
projectList
;
}
@Override
public
TEmployeeProject
getInfoById
(
String
id
)
{
TEmployeeProject
project
=
this
.
getById
(
id
);
TEmployeeProjectBelongDept
dept
=
tEmployeeProjectBelongDeptService
.
getById
(
id
);
if
(
dept
!=
null
)
{
project
.
setEmpDeptid
(
dept
.
getEmpDeptid
());
project
.
setEmpDeptname
(
dept
.
getEmpDeptname
());
}
return
project
;
}
@Override
public
List
<
TEmployeeProject
>
getListByEmpIdAndDeptNo
(
String
empId
,
String
deptNo
)
{
TEmployeeProject
project
=
new
TEmployeeProject
();
...
...
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