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
21ccf6c1
Commit
21ccf6c1
authored
Jan 05, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
假勤管理修改
parent
2a8e6d99
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
28 deletions
+25
-28
EmployeeBusinessController.java
.../yifu/archives/controller/EmployeeBusinessController.java
+18
-19
TBusinessEmployeeExtendInfoService.java
.../archives/service/TBusinessEmployeeExtendInfoService.java
+2
-3
TBusinessEmployeeExtendInfoServiceImpl.java
.../service/impl/TBusinessEmployeeExtendInfoServiceImpl.java
+5
-6
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeBusinessController.java
View file @
21ccf6c1
...
...
@@ -221,8 +221,8 @@ public class EmployeeBusinessController {
* @date: 2021/8/17
*/
@Inner
@
Ge
tMapping
(
"/inner/getNotLeaveExtendList"
)
public
R
<
List
<
BusinessEmployeeExtendVO
>>
getNotLeaveExtendList
()
{
@
Pos
tMapping
(
"/inner/getNotLeaveExtendList"
)
public
TBusinessDataListVo
getNotLeaveExtendList
()
{
return
this
.
businessEmployeeExtendInfoService
.
getNotLeaveExtendList
();
}
...
...
@@ -308,8 +308,8 @@ public class EmployeeBusinessController {
*/
@Inner
@PostMapping
(
"/inner/getAllExtendList"
)
public
T
SettleDomain
ListVo
getAllExtendList
()
{
T
SettleDomainListVo
vo
=
new
TSettleDomain
ListVo
();
public
T
BusinessData
ListVo
getAllExtendList
()
{
T
BusinessDataListVo
vo
=
new
TBusinessData
ListVo
();
List
<
TBusinessEmployeeExtendInfo
>
list
=
this
.
businessEmployeeExtendInfoService
.
list
();
vo
.
setExtendInfo
(
list
);
return
vo
;
...
...
@@ -323,12 +323,11 @@ public class EmployeeBusinessController {
*/
@Inner
@PostMapping
(
"/inner/getExtendByBusinessTelecomNumber"
)
R
<
TBusinessEmployeeExtendInfo
>
getExtendByBusinessTelecomNumber
(
@RequestParam
(
"businessTelecomNumber"
)
String
businessTelecomNumber
)
{
TBusinessEmployeeExtendInfo
businessEmployeeExtendInfo
=
this
.
businessEmployeeExtendInfoService
.
lambdaQuery
()
public
TBusinessEmployeeExtendInfo
getExtendByBusinessTelecomNumber
(
@RequestBody
String
businessTelecomNumber
)
{
return
this
.
businessEmployeeExtendInfoService
.
lambdaQuery
()
.
eq
(
TBusinessEmployeeExtendInfo:
:
getBusinessTelecomNumber
,
businessTelecomNumber
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)
.
one
();
return
R
.
ok
(
businessEmployeeExtendInfo
,
CommonConstants
.
SEARCH_SUCCESS
);
}
/**
...
...
@@ -427,7 +426,7 @@ public class EmployeeBusinessController {
* @return: com.yifu.cloud.v1.common.core.util.R<com.yifu.cloud.v1.hrms.api.entity.basic.TBusinessEmployeeExtendInfo>
**/
@Operation
(
description
=
"根据电信编号,获取附属信息"
)
@
Ge
tMapping
(
"/getByBusinessTelecomNumber"
)
@
Pos
tMapping
(
"/getByBusinessTelecomNumber"
)
public
R
<
TBusinessEmployeeExtendInfo
>
getByBusinessTelecomNumber
(
@RequestParam
String
businessTelecomNumber
)
{
return
new
R
<>(
businessEmployeeExtendInfoService
.
getByBusinessTelecomNumber
(
businessTelecomNumber
));
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TBusinessEmployeeExtendInfoService.java
View file @
21ccf6c1
...
...
@@ -3,10 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.archives.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendByLeave
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.
BusinessEmployeeExtendVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.
TBusinessDataListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmployeeExtendRedundancyDTO
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -76,7 +75,7 @@ public interface TBusinessEmployeeExtendInfoService extends IService<TBusinessEm
* @author: wangweiguo
* @date: 2021/8/17
*/
R
<
List
<
BusinessEmployeeExtendVO
>>
getNotLeaveExtendList
();
TBusinessDataListVo
getNotLeaveExtendList
();
/**
* @param
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TBusinessEmployeeExtendInfoServiceImpl.java
View file @
21ccf6c1
...
...
@@ -14,10 +14,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TBusinessEmployeeExtendInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TBusinessEmployeeExtendInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TBusinessEmployeeExtendInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendByLeave
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.BusinessEmployeeExtendVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateBusinessEmployeeExtendDTO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.UpdateEmployeeExtendRedundancyDTO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
...
...
@@ -357,9 +354,11 @@ implements TBusinessEmployeeExtendInfoService {
* @date: 2021/8/17
*/
@Override
public
R
<
List
<
BusinessEmployeeExtendVO
>>
getNotLeaveExtendList
()
{
public
TBusinessDataListVo
getNotLeaveExtendList
()
{
List
<
BusinessEmployeeExtendVO
>
list
=
this
.
baseMapper
.
getNotLeaveExtendList
();
return
R
.
ok
(
list
);
TBusinessDataListVo
vo
=
new
TBusinessDataListVo
();
vo
.
setExtendVO
(
list
);
return
vo
;
}
/**
...
...
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