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
02be0a0c
Commit
02be0a0c
authored
Jul 09, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
35e831a1
b3436a75
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
TCompleteMonitorController.java
.../yifu/archives/controller/TCompleteMonitorController.java
+4
-4
TCompleteMonitorService.java
...lus/v1/yifu/archives/service/TCompleteMonitorService.java
+1
-1
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+2
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCompleteMonitorController.java
View file @
02be0a0c
...
...
@@ -119,13 +119,13 @@ public class TCompleteMonitorController {
/**
* 通过id查询-主表
*
* @param i
nfoId infoI
d
* @param i
d i
d
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/infoId
/{id}
"
)
public
R
<
EmpMainDetailVo
>
getInfoById
(
@PathVariable
(
"id"
)
String
info
Id
)
{
return
tCompleteMonitorService
.
getInfoById
(
i
nfo
Id
);
@GetMapping
(
"/infoId"
)
public
R
<
EmpMainDetailVo
>
getInfoById
(
String
id
,
String
dept
Id
)
{
return
tCompleteMonitorService
.
getInfoById
(
i
d
,
dept
Id
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TCompleteMonitorService.java
View file @
02be0a0c
...
...
@@ -32,7 +32,7 @@ public interface TCompleteMonitorService extends IService<TCompleteMonitor> {
* @Date: 2024/6/28 11:41
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.entity.TPreEmpMain>
**/
R
<
EmpMainDetailVo
>
getInfoById
(
String
id
);
R
<
EmpMainDetailVo
>
getInfoById
(
String
id
,
String
deptId
);
/**
* 档案完整度监控导出
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
02be0a0c
...
...
@@ -424,7 +424,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.archives.vo.EmpMainDetailVo>
**/
@Override
public
R
<
EmpMainDetailVo
>
getInfoById
(
String
id
)
{
public
R
<
EmpMainDetailVo
>
getInfoById
(
String
id
,
String
deptId
)
{
EmpMainDetailVo
vo
=
new
EmpMainDetailVo
();
if
(
id
!=
null
)
{
// 员工不良记录表
...
...
@@ -457,7 +457,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
TEmployeeInfo
tEmployeeInfo
=
tEmployeeInfoService
.
getById
(
id
);
vo
.
setTEmployeeInfo
(
tEmployeeInfo
);
// 项目档案表
TEmployeeProject
tEmployeeProject
=
tEmployeeProjectService
.
get
ListByEmpId
(
id
,
1
).
get
(
0
);
TEmployeeProject
tEmployeeProject
=
tEmployeeProjectService
.
get
ByEmpIdAndDeptId
(
id
,
deptId
);
vo
.
setTEmployeeProject
(
tEmployeeProject
);
// 员工职业资格信息表
List
<
TEmpProfessionalQualification
>
tEmpProfessionalQualificationList
=
tEmpProfessionalQualificationService
.
getListByEmpId
(
id
);
...
...
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